diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2013-01-13 08:20:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 17:40:02 -0500 |
commit | 450c7dd65b6c28c8f5b445c75bb55e8b84133bb9 (patch) | |
tree | c01ee1c23c8a545bf8b7486555bdbd0b23f0b838 /drivers/media | |
parent | 146b7ee63866cee57620ec08d10250f7fffaf4bc (diff) |
[media] em28xx: fix a comment and a small coding style issue
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-input.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index d500e9c2f9e2..f3cff2bfb5ba 100644 --- a/drivers/media/usb/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c | |||
@@ -89,8 +89,7 @@ static int em28xx_get_key_terratec(struct i2c_client *i2c_dev, u32 *ir_key) | |||
89 | return -EIO; | 89 | return -EIO; |
90 | 90 | ||
91 | /* it seems that 0xFE indicates that a button is still hold | 91 | /* it seems that 0xFE indicates that a button is still hold |
92 | down, while 0xff indicates that no button is hold | 92 | down, while 0xff indicates that no button is hold down. */ |
93 | down. 0xfe sequences are sometimes interrupted by 0xFF */ | ||
94 | 93 | ||
95 | if (b == 0xff) | 94 | if (b == 0xff) |
96 | return 0; | 95 | return 0; |
@@ -170,8 +169,7 @@ static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev, | |||
170 | unsigned char subaddr, keydetect, key; | 169 | unsigned char subaddr, keydetect, key; |
171 | 170 | ||
172 | struct i2c_msg msg[] = { { .addr = i2c_dev->addr, .flags = 0, .buf = &subaddr, .len = 1}, | 171 | struct i2c_msg msg[] = { { .addr = i2c_dev->addr, .flags = 0, .buf = &subaddr, .len = 1}, |
173 | 172 | { .addr = i2c_dev->addr, .flags = I2C_M_RD, .buf = &keydetect, .len = 1} }; | |
174 | { .addr = i2c_dev->addr, .flags = I2C_M_RD, .buf = &keydetect, .len = 1} }; | ||
175 | 173 | ||
176 | subaddr = 0x10; | 174 | subaddr = 0x10; |
177 | if (2 != i2c_transfer(i2c_dev->adapter, msg, 2)) | 175 | if (2 != i2c_transfer(i2c_dev->adapter, msg, 2)) |