[PATCH 3/4] [media] em28xx: usb power config is in the low byte.

2013-07-16 Thread Alban Browaeys 
According to the em2860 datasheet, eeprom byte 08H is Chip
Configuration Low Byte and 09H is High Byte.
Usb power configuration is in the Low byte (same as the usb audio
 class config).

Signed-off-by: Alban Browaeys 
---
 drivers/media/usb/em28xx/em28xx-i2c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c 
b/drivers/media/usb/em28xx/em28xx-i2c.c
index c4ff973..6ff7415 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -743,13 +743,13 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned 
bus,
break;
}
 
-   if (le16_to_cpu(dev_config->chip_conf) & 1 << 3)
+   if (le16_to_cpu(dev_config->chip_conf) >> 4 & 1 << 3)
em28xx_info("\tUSB Remote wakeup capable\n");
 
-   if (le16_to_cpu(dev_config->chip_conf) & 1 << 2)
+   if (le16_to_cpu(dev_config->chip_conf) >> 4 & 1 << 2)
em28xx_info("\tUSB Self power capable\n");
 
-   switch (le16_to_cpu(dev_config->chip_conf) & 0x3) {
+   switch (le16_to_cpu(dev_config->chip_conf) >> 4 & 0x3) {
case 0:
em28xx_info("\t500mA max power\n");
break;
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/4] [media] em28xx: usb power config is in the low byte.

2013-07-16 Thread Alban Browaeys 
According to the em2860 datasheet, eeprom byte 08H is Chip
Configuration Low Byte and 09H is High Byte.
Usb power configuration is in the Low byte (same as the usb audio
 class config).

Signed-off-by: Alban Browaeys pra...@yahoo.com
---
 drivers/media/usb/em28xx/em28xx-i2c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c 
b/drivers/media/usb/em28xx/em28xx-i2c.c
index c4ff973..6ff7415 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -743,13 +743,13 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned 
bus,
break;
}
 
-   if (le16_to_cpu(dev_config-chip_conf)  1  3)
+   if (le16_to_cpu(dev_config-chip_conf)  4  1  3)
em28xx_info(\tUSB Remote wakeup capable\n);
 
-   if (le16_to_cpu(dev_config-chip_conf)  1  2)
+   if (le16_to_cpu(dev_config-chip_conf)  4  1  2)
em28xx_info(\tUSB Self power capable\n);
 
-   switch (le16_to_cpu(dev_config-chip_conf)  0x3) {
+   switch (le16_to_cpu(dev_config-chip_conf)  4  0x3) {
case 0:
em28xx_info(\t500mA max power\n);
break;
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/