aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-09-29 01:09:42 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-30 12:32:00 -0400
commit4c4364e022f8422e602edbb97a2d873dc0b6c769 (patch)
tree664c96efee5d6e5d83c0e788a40b68bc71e606c7
parent446b792c6bd87de4565ba200b75a708b4c575a06 (diff)
[media] mxl111sf: fix a couple precedence bugs
Negate has higher precedence than bitwise AND. I2C_M_RD is 0x1 so the original code is equivelent to just checking if (!msg->flags). Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Steven Toth <stoth@kernellabs.com> Cc: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/mxl111sf-i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-i2c.c b/drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
index a330987f7e11..2e8c288258a9 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-i2c.c
@@ -453,7 +453,7 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state,
453 453
454 mxl_i2c("addr: 0x%02x, read buff len: %d, write buff len: %d", 454 mxl_i2c("addr: 0x%02x, read buff len: %d, write buff len: %d",
455 msg->addr, (msg->flags & I2C_M_RD) ? msg->len : 0, 455 msg->addr, (msg->flags & I2C_M_RD) ? msg->len : 0,
456 (!msg->flags & I2C_M_RD) ? msg->len : 0); 456 (!(msg->flags & I2C_M_RD)) ? msg->len : 0);
457 457
458 for (index = 0; index < 26; index++) 458 for (index = 0; index < 26; index++)
459 buf[index] = USB_END_I2C_CMD; 459 buf[index] = USB_END_I2C_CMD;
@@ -489,7 +489,7 @@ static int mxl111sf_i2c_hw_xfer_msg(struct mxl111sf_state *state,
489 ret = mxl111sf_i2c_send_data(state, 0, buf); 489 ret = mxl111sf_i2c_send_data(state, 0, buf);
490 490
491 /* write data on I2C bus */ 491 /* write data on I2C bus */
492 if ((!msg->flags & I2C_M_RD) && (msg->len > 0)) { 492 if (!(msg->flags & I2C_M_RD) && (msg->len > 0)) {
493 mxl_i2c("%d\t%02x", msg->len, msg->buf[0]); 493 mxl_i2c("%d\t%02x", msg->len, msg->buf[0]);
494 494
495 /* control register on I2C interface to initialize I2C bus */ 495 /* control register on I2C interface to initialize I2C bus */