Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next

Conflicts:
	fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.

7 files changed, 109 insertions, 24 deletions

diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index 36f2d76006fd..f11e47a58286 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -56,7 +56,8 @@ static const struct cx18_card cx18_card_hvr1600_esmt = {
         .hw_audio_ctrl = CX18_HW_418_AV,
         .hw_muxer = CX18_HW_CS5345,
         .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER |
-                  CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL,
+                  CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL |
+                  CX18_HW_Z8F0811_IR_HAUP,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },
@@ -102,7 +103,8 @@ static const struct cx18_card cx18_card_hvr1600_samsung = {
         .hw_audio_ctrl = CX18_HW_418_AV,
         .hw_muxer = CX18_HW_CS5345,
         .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER |
-                  CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL,
+                  CX18_HW_CS5345 | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL |
+                  CX18_HW_Z8F0811_IR_HAUP,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX18_AV_SVIDEO1    },
@@ -204,7 +206,7 @@ static const struct cx18_card cx18_card_mpc718 = {
         .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_418_AV,
         .hw_muxer = CX18_HW_GPIO_MUX,
-        .hw_all = CX18_HW_418_AV | CX18_HW_TUNER |
+        .hw_all = CX18_HW_TVEEPROM | CX18_HW_418_AV | CX18_HW_TUNER |
                   CX18_HW_GPIO_MUX | CX18_HW_DVB | CX18_HW_GPIO_RESET_CTRL,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX18_AV_COMPOSITE2 },
diff --git a/drivers/media/video/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h
index 3c552b6b7c4d..444e3c7c563e 100644
--- a/drivers/media/video/cx18/cx18-cards.h
+++ b/drivers/media/video/cx18/cx18-cards.h
@@ -22,13 +22,17 @@
  */
 
 /* hardware flags */
-#define CX18_HW_TUNER           (1 << 0)
-#define CX18_HW_TVEEPROM        (1 << 1)
-#define CX18_HW_CS5345          (1 << 2)
-#define CX18_HW_DVB             (1 << 3)
-#define CX18_HW_418_AV          (1 << 4)
-#define CX18_HW_GPIO_MUX        (1 << 5)
-#define CX18_HW_GPIO_RESET_CTRL (1 << 6)
+#define CX18_HW_TUNER                   (1 << 0)
+#define CX18_HW_TVEEPROM                (1 << 1)
+#define CX18_HW_CS5345                  (1 << 2)
+#define CX18_HW_DVB                     (1 << 3)
+#define CX18_HW_418_AV                  (1 << 4)
+#define CX18_HW_GPIO_MUX                (1 << 5)
+#define CX18_HW_GPIO_RESET_CTRL         (1 << 6)
+#define CX18_HW_Z8F0811_IR_TX_HAUP      (1 << 7)
+#define CX18_HW_Z8F0811_IR_RX_HAUP      (1 << 8)
+#define CX18_HW_Z8F0811_IR_HAUP (CX18_HW_Z8F0811_IR_RX_HAUP | \
+                                 CX18_HW_Z8F0811_IR_TX_HAUP)
 
 /* video inputs */
 #define CX18_CARD_INPUT_VID_TUNER       1
diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index 5136df198338..93f0dae01350 100644
--- a/drivers/media/video/cx18/cx18-controls.c
+++ b/drivers/media/video/cx18/cx18-controls.c
@@ -20,6 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307  USA
  */
+#include <linux/kernel.h>
 
 #include "cx18-driver.h"
 #include "cx18-cards.h"
@@ -317,7 +318,7 @@ int cx18_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c)
                 idx = p.audio_properties & 0x03;
                 /* The audio clock of the digitizer must match the codec sample
                    rate otherwise you get some very strange effects. */
-                if (idx < sizeof(freqs))
+                if (idx < ARRAY_SIZE(freqs))
                         cx18_call_all(cx, audio, s_clock_freq, freqs[idx]);
                 return err;
         }
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 92026e82e10e..dd0224f328ad 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -268,6 +268,20 @@ static void cx18_iounmap(struct cx18 *cx)
         }
 }
 
+static void cx18_eeprom_dump(struct cx18 *cx, unsigned char *eedata, int len)
+{
+        int i;
+
+        CX18_INFO("eeprom dump:\n");
+        for (i = 0; i < len; i++) {
+                if (0 == (i % 16))
+                        CX18_INFO("eeprom %02x:", i);
+                printk(KERN_CONT " %02x", eedata[i]);
+                if (15 == (i % 16))
+                        printk(KERN_CONT "\n");
+        }
+}
+
 /* Hauppauge card? get values from tveeprom */
 void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
 {
@@ -279,8 +293,26 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
         c.adapter = &cx->i2c_adap[0];
         c.addr = 0xA0 >> 1;
 
-        tveeprom_read(&c, eedata, sizeof(eedata));
-        tveeprom_hauppauge_analog(&c, tv, eedata);
+        memset(tv, 0, sizeof(*tv));
+        if (tveeprom_read(&c, eedata, sizeof(eedata)))
+                return;
+
+        switch (cx->card->type) {
+        case CX18_CARD_HVR_1600_ESMT:
+        case CX18_CARD_HVR_1600_SAMSUNG:
+                tveeprom_hauppauge_analog(&c, tv, eedata);
+                break;
+        case CX18_CARD_YUAN_MPC718:
+                tv->model = 0x718;
+                cx18_eeprom_dump(cx, eedata, sizeof(eedata));
+                CX18_INFO("eeprom PCI ID: %02x%02x:%02x%02x\n",
+                          eedata[2], eedata[1], eedata[4], eedata[3]);
+                break;
+        default:
+                tv->model = 0xffffffff;
+                cx18_eeprom_dump(cx, eedata, sizeof(eedata));
+                break;
+        }
 }
 
 static void cx18_process_eeprom(struct cx18 *cx)
@@ -298,6 +330,11 @@ static void cx18_process_eeprom(struct cx18 *cx)
         case 74000 ... 74999:
                 cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
                 break;
+        case 0x718:
+                return;
+        case 0xffffffff:
+                CX18_INFO("Unknown EEPROM encoding\n");
+                return;
         case 0:
                 CX18_ERR("Invalid EEPROM\n");
                 return;
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 29969c18949c..04d9c2508b86 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -690,7 +690,7 @@ int cx18_v4l2_open(struct file *filp)
         int res;
         struct video_device *video_dev = video_devdata(filp);
         struct cx18_stream *s = video_get_drvdata(video_dev);
-        struct cx18 *cx = s->cx;;
+        struct cx18 *cx = s->cx;
 
         mutex_lock(&cx->serialize_lock);
         if (cx18_init_on_first_open(cx)) {
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 8591e4fc359f..da395fef50df 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -28,6 +28,7 @@
 #include "cx18-gpio.h"
 #include "cx18-i2c.h"
 #include "cx18-irq.h"
+#include <media/ir-kbd-i2c.h>
 
 #define CX18_REG_I2C_1_WR   0xf15000
 #define CX18_REG_I2C_1_RD   0xf15008
@@ -40,16 +41,20 @@
 #define GETSDL_BIT      0x0008
 
 #define CX18_CS5345_I2C_ADDR            0x4c
+#define CX18_Z8F0811_IR_TX_I2C_ADDR     0x70
+#define CX18_Z8F0811_IR_RX_I2C_ADDR     0x71
 
 /* This array should match the CX18_HW_ defines */
 static const u8 hw_addrs[] = {
-        0,                      /* CX18_HW_TUNER */
-        0,                      /* CX18_HW_TVEEPROM */
-        CX18_CS5345_I2C_ADDR,   /* CX18_HW_CS5345 */
-        0,                      /* CX18_HW_DVB */
-        0,                      /* CX18_HW_418_AV */
-        0,                      /* CX18_HW_GPIO_MUX */
-        0,                      /* CX18_HW_GPIO_RESET_CTRL */
+        0,                              /* CX18_HW_TUNER */
+        0,                              /* CX18_HW_TVEEPROM */
+        CX18_CS5345_I2C_ADDR,           /* CX18_HW_CS5345 */
+        0,                              /* CX18_HW_DVB */
+        0,                              /* CX18_HW_418_AV */
+        0,                              /* CX18_HW_GPIO_MUX */
+        0,                              /* CX18_HW_GPIO_RESET_CTRL */
+        CX18_Z8F0811_IR_TX_I2C_ADDR,    /* CX18_HW_Z8F0811_IR_TX_HAUP */
+        CX18_Z8F0811_IR_RX_I2C_ADDR,    /* CX18_HW_Z8F0811_IR_RX_HAUP */
 };
 
 /* This array should match the CX18_HW_ defines */
@@ -62,6 +67,8 @@ static const u8 hw_bus[] = {
         0,      /* CX18_HW_418_AV */
         0,      /* CX18_HW_GPIO_MUX */
         0,      /* CX18_HW_GPIO_RESET_CTRL */
+        0,      /* CX18_HW_Z8F0811_IR_TX_HAUP */
+        0,      /* CX18_HW_Z8F0811_IR_RX_HAUP */
 };
 
 /* This array should match the CX18_HW_ defines */
@@ -73,6 +80,8 @@ static const char * const hw_modules[] = {
         NULL,           /* CX18_HW_418_AV */
         NULL,           /* CX18_HW_GPIO_MUX */
         NULL,           /* CX18_HW_GPIO_RESET_CTRL */
+        NULL,           /* CX18_HW_Z8F0811_IR_TX_HAUP */
+        NULL,           /* CX18_HW_Z8F0811_IR_RX_HAUP */
 };
 
 /* This array should match the CX18_HW_ defines */
@@ -84,8 +93,38 @@ static const char * const hw_devicenames[] = {
         "cx23418_AV",
         "gpio_mux",
         "gpio_reset_ctrl",
+        "ir_tx_z8f0811_haup",
+        "ir_rx_z8f0811_haup",
 };
 
+static const struct IR_i2c_init_data z8f0811_ir_init_data = {
+        .ir_codes = &ir_codes_hauppauge_new_table,
+        .internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR,
+        .type = IR_TYPE_RC5,
+        .name = "CX23418 Z8F0811 Hauppauge",
+};
+
+static int cx18_i2c_new_ir(struct i2c_adapter *adap, u32 hw, const char *type,
+                           u8 addr)
+{
+        struct i2c_board_info info;
+        unsigned short addr_list[2] = { addr, I2C_CLIENT_END };
+
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, type, I2C_NAME_SIZE);
+
+        /* Our default information for ir-kbd-i2c.c to use */
+        switch (hw) {
+        case CX18_HW_Z8F0811_IR_RX_HAUP:
+                info.platform_data = &z8f0811_ir_init_data;
+                break;
+        default:
+                break;
+        }
+
+        return i2c_new_probed_device(adap, &info, addr_list) == NULL ? -1 : 0;
+}
+
 int cx18_i2c_register(struct cx18 *cx, unsigned idx)
 {
         struct v4l2_subdev *sd;
@@ -115,11 +154,14 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
                 return sd != NULL ? 0 : -1;
         }
 
+        if (hw & CX18_HW_Z8F0811_IR_HAUP)
+                return cx18_i2c_new_ir(adap, hw, type, hw_addrs[idx]);
+
         /* Is it not an I2C device or one we do not wish to register? */
         if (!hw_addrs[idx])
                 return -1;
 
-        /* It's an I2C device other than an analog tuner */
+        /* It's an I2C device other than an analog tuner or IR chip */
         sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, adap, mod, type, hw_addrs[idx]);
         if (sd != NULL)
                 sd->grp_id = hw;
@@ -190,7 +232,6 @@ static int cx18_getsda(void *data)
 /* template for i2c-bit-algo */
 static struct i2c_adapter cx18_i2c_adap_template = {
         .name = "cx18 i2c driver",
-        .id = I2C_HW_B_CX2341X,
         .algo = NULL,                   /* set by i2c-algo-bit */
         .algo_data = NULL,              /* filled from template */
         .owner = THIS_MODULE,
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index d7b1921e6666..fc76e4d6ffa7 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -605,7 +605,7 @@ int cx18_s_input(struct file *file, void *fh, unsigned int inp)
         if (ret)
                 return ret;
 
-        if (inp < 0 || inp >= cx->nof_inputs)
+        if (inp >= cx->nof_inputs)
                 return -EINVAL;
 
         if (inp == cx->active_input) {