diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-12-23 14:38:53 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:17:16 -0500 |
| commit | fe04164647588ec55937e6d696da1ebeca04d000 (patch) | |
| tree | 3ddce3c4191a268a11dd5789734e82b3859470ab /drivers/media | |
| parent | 50155c25bf346b65fec8e215131df397b0a5ee6e (diff) | |
[media] cx231xxx: fix typo in saddr_len check
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index 44d124c2fc35..7d62d58617f5 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c | |||
| @@ -1515,7 +1515,7 @@ int cx231xx_read_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr, | |||
| 1515 | 1515 | ||
| 1516 | if (saddr_len == 0) | 1516 | if (saddr_len == 0) |
| 1517 | saddr = 0; | 1517 | saddr = 0; |
| 1518 | else if (saddr_len == 0) | 1518 | else if (saddr_len == 1) |
| 1519 | saddr &= 0xff; | 1519 | saddr &= 0xff; |
| 1520 | 1520 | ||
| 1521 | /* prepare xfer_data struct */ | 1521 | /* prepare xfer_data struct */ |
| @@ -1566,7 +1566,7 @@ int cx231xx_write_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr, | |||
| 1566 | 1566 | ||
| 1567 | if (saddr_len == 0) | 1567 | if (saddr_len == 0) |
| 1568 | saddr = 0; | 1568 | saddr = 0; |
| 1569 | else if (saddr_len == 0) | 1569 | else if (saddr_len == 1) |
| 1570 | saddr &= 0xff; | 1570 | saddr &= 0xff; |
| 1571 | 1571 | ||
| 1572 | /* prepare xfer_data struct */ | 1572 | /* prepare xfer_data struct */ |
| @@ -1600,7 +1600,7 @@ int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr, | |||
| 1600 | 1600 | ||
| 1601 | if (saddr_len == 0) | 1601 | if (saddr_len == 0) |
| 1602 | saddr = 0; | 1602 | saddr = 0; |
| 1603 | else if (saddr_len == 0) | 1603 | else if (saddr_len == 1) |
| 1604 | saddr &= 0xff; | 1604 | saddr &= 0xff; |
| 1605 | 1605 | ||
| 1606 | /* prepare xfer_data struct */ | 1606 | /* prepare xfer_data struct */ |
| @@ -1641,7 +1641,7 @@ int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr, | |||
| 1641 | 1641 | ||
| 1642 | if (saddr_len == 0) | 1642 | if (saddr_len == 0) |
| 1643 | saddr = 0; | 1643 | saddr = 0; |
| 1644 | else if (saddr_len == 0) | 1644 | else if (saddr_len == 1) |
| 1645 | saddr &= 0xff; | 1645 | saddr &= 0xff; |
| 1646 | 1646 | ||
| 1647 | /* prepare xfer_data struct */ | 1647 | /* prepare xfer_data struct */ |