Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d90f0677 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx-i2c: also print debug messages at debug level 1 



The current code uses only a single debug level and all debug messages are
printed for i2c_debug >= 2 only. So debug level 1 is actually the same as
level 0, which is odd.
Users expect debugging messages to become enabled for anything else than
debug level 0.
Fix it and simplify the code a bit by printing the debug messages also at debug
level 1;

Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 12d7ce18

drivers/media/usb/em28xx/em28xx-i2c.c

+6 −6
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, 
		return 0;

	for (i = 0; i < num; i++) {

		addr = msgs[i].addr << 1;

		if (i2c_debug >= 2)

		if (i2c_debug)

			printk(KERN_DEBUG "%s at %s: %s %s addr=%02x len=%d:",

			       dev->name, __func__ ,

			       (msgs[i].flags & I2C_M_RD) ? "read" : "write",
@@ -299,7 +299,7 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, 
			else

				rc = em28xx_i2c_check_for_device(dev, addr);

			if (rc == -ENODEV) {

				if (i2c_debug >= 2)

				if (i2c_debug)

					printk(" no device\n");

				return rc;

			}
@@ -313,13 +313,13 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, 
				rc = em28xx_i2c_recv_bytes(dev, addr,

							   msgs[i].buf,

							   msgs[i].len);

			if (i2c_debug >= 2) {

			if (i2c_debug) {

				for (byte = 0; byte < msgs[i].len; byte++)

					printk(" %02x", msgs[i].buf[byte]);

			}

		} else {

			/* write bytes */

			if (i2c_debug >= 2) {

			if (i2c_debug) {

				for (byte = 0; byte < msgs[i].len; byte++)

					printk(" %02x", msgs[i].buf[byte]);

			}
@@ -334,11 +334,11 @@ static int em28xx_i2c_xfer(struct i2c_adapter *i2c_adap, 
							   i == num - 1);

		}

		if (rc < 0) {

			if (i2c_debug >= 2)

			if (i2c_debug)

				printk(" ERROR: %i\n", rc);

			return rc;

		}

		if (i2c_debug >= 2)

		if (i2c_debug)

			printk("\n");

	}