Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / cx231xx / cx231xx-core.c

diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
index 4af46fca9b0a5f1e9a1530ed0a1eaf5c47dbe000..7d62d58617f55e8d25877f282dd29311e978de95 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/drivers/media/video/cx231xx/cx231xx-core.c
@@ -740,6 +740,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)
                case CX231XX_BOARD_CNXT_RDE_253S:
                case CX231XX_BOARD_CNXT_RDU_253S:
                case CX231XX_BOARD_HAUPPAUGE_EXETER:
+               case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
                errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);
                        break;
                default:
@@ -1288,7 +1289,7 @@ int cx231xx_dev_init(struct cx231xx *dev)
        /* Internal Master 3 Bus */
        dev->i2c_bus[2].nr = 2;
        dev->i2c_bus[2].dev = dev;
-       dev->i2c_bus[2].i2c_period = I2C_SPEED_400K;    /* 400kHz */
+       dev->i2c_bus[2].i2c_period = I2C_SPEED_100K;    /* 100kHz */
        dev->i2c_bus[2].i2c_nostop = 0;
        dev->i2c_bus[2].i2c_reserve = 0;
 
@@ -1381,6 +1382,7 @@ int cx231xx_dev_init(struct cx231xx *dev)
        case CX231XX_BOARD_CNXT_RDE_253S:
        case CX231XX_BOARD_CNXT_RDU_253S:
        case CX231XX_BOARD_HAUPPAUGE_EXETER:
+       case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
        errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);
                break;
        default:
@@ -1513,7 +1515,7 @@ int cx231xx_read_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,
 
        if (saddr_len == 0)
                saddr = 0;
-       else if (saddr_len == 0)
+       else if (saddr_len == 1)
                saddr &= 0xff;
 
        /* prepare xfer_data struct */
@@ -1564,7 +1566,7 @@ int cx231xx_write_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,
 
        if (saddr_len == 0)
                saddr = 0;
-       else if (saddr_len == 0)
+       else if (saddr_len == 1)
                saddr &= 0xff;
 
        /* prepare xfer_data struct */
@@ -1598,7 +1600,7 @@ int cx231xx_read_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,
 
        if (saddr_len == 0)
                saddr = 0;
-       else if (saddr_len == 0)
+       else if (saddr_len == 1)
                saddr &= 0xff;
 
        /* prepare xfer_data struct */
@@ -1639,7 +1641,7 @@ int cx231xx_write_i2c_data(struct cx231xx *dev, u8 dev_addr, u16 saddr,
 
        if (saddr_len == 0)
                saddr = 0;
-       else if (saddr_len == 0)
+       else if (saddr_len == 1)
                saddr &= 0xff;
 
        /* prepare xfer_data struct */