Skip to content

Commit

Permalink
[media] cx231xxx: fix typo in saddr_len check
Browse files Browse the repository at this point in the history
The original code compared "saddr_len" with zero twice in a nonsensical
way.  I asked the list, and Andy Walls and Sri Deevi say that the second
check should be if "saddr_len == 1".

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Srinivasa Deevi <Srinivasa.deevi@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Dec 29, 2010
1 parent 50155c2 commit fe04164
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/video/cx231xx/cx231xx-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ int cx231xx_read_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down Expand Up @@ -1566,7 +1566,7 @@ int cx231xx_write_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down Expand Up @@ -1600,7 +1600,7 @@ int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down Expand Up @@ -1641,7 +1641,7 @@ int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,

if (saddr_len == 0)
saddr = 0;
else if (saddr_len == 0)
else if (saddr_len == 1)
saddr &= 0xff;

/* prepare xfer_data struct */
Expand Down

0 comments on commit fe04164

Please sign in to comment.