diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-09-04 02:33:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:58 -0400 |
commit | d45b9b8ab43c8973a9630ac54f4ede6c3e009f9e (patch) | |
tree | d5937a21d2d7520cc937a93ce7caa8665a96303f /drivers/media/video/em28xx/em28xx-i2c.c | |
parent | 2bb87c24d7d5639bff65b41b1306542d6d2bf7d0 (diff) |
V4L/DVB (8906): v4l-dvb: fix assorted sparse warnings
Fix sparse warnings. None are serious, but cutting down on these helps find
future serious sparse warnings/errors.
Redid the av7710.c patch based on a suggestion by Oliver Endriss.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-i2c.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 97853384c943..2989a65f6917 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -143,10 +143,11 @@ static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr) | |||
143 | } | 143 | } |
144 | for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0; | 144 | for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0; |
145 | write_timeout -= 5) { | 145 | write_timeout -= 5) { |
146 | unsigned msg = dev->em28xx_read_reg(dev, 0x5); | 146 | unsigned reg = dev->em28xx_read_reg(dev, 0x5); |
147 | if (msg == 0x94) | 147 | |
148 | if (reg == 0x94) | ||
148 | return -ENODEV; | 149 | return -ENODEV; |
149 | else if (msg == 0x84) | 150 | else if (reg == 0x84) |
150 | return 0; | 151 | return 0; |
151 | msleep(5); | 152 | msleep(5); |
152 | } | 153 | } |