From e110ccaf8430c6ef0c4f29f7c1786ef4088725f6 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Sun, 13 Jan 2013 10:20:43 -0300 Subject: [PATCH] --- yaml --- r: 357478 b: refs/heads/master c: 450c7dd65b6c28c8f5b445c75bb55e8b84133bb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-input.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1eb462d41834..8635f2f44eb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 146b7ee63866cee57620ec08d10250f7fffaf4bc +refs/heads/master: 450c7dd65b6c28c8f5b445c75bb55e8b84133bb9 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-input.c b/trunk/drivers/media/usb/em28xx/em28xx-input.c index d500e9c2f9e2..f3cff2bfb5ba 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-input.c +++ b/trunk/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) return -EIO; /* it seems that 0xFE indicates that a button is still hold - down, while 0xff indicates that no button is hold - down. 0xfe sequences are sometimes interrupted by 0xFF */ + down, while 0xff indicates that no button is hold down. */ if (b == 0xff) return 0; @@ -170,8 +169,7 @@ static int em28xx_get_key_winfast_usbii_deluxe(struct i2c_client *i2c_dev, unsigned char subaddr, keydetect, key; struct i2c_msg msg[] = { { .addr = i2c_dev->addr, .flags = 0, .buf = &subaddr, .len = 1}, - - { .addr = i2c_dev->addr, .flags = I2C_M_RD, .buf = &keydetect, .len = 1} }; + { .addr = i2c_dev->addr, .flags = I2C_M_RD, .buf = &keydetect, .len = 1} }; subaddr = 0x10; if (2 != i2c_transfer(i2c_dev->adapter, msg, 2))