Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

4 files changed, 8 insertions, 31 deletions

diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 307e847fe1cd..37fe16181e3c 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -341,10 +341,8 @@ struct card_info {
         enum card_type type;
         char name[32];
         const char *i2c_decoder;        /* i2c decoder device */
-        const char *mod_decoder;        /* i2c decoder module */
         const unsigned short *addrs_decoder;
         const char *i2c_encoder;        /* i2c encoder device */
-        const char *mod_encoder;        /* i2c encoder module */
         const unsigned short *addrs_encoder;
         u16 video_vfe, video_codec;                     /* videocodec types */
         u16 audio_chip;                                 /* audio type */
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index bfcd3aef50f9..0aac376c3f7a 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -379,7 +379,6 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = DC10_old,
                 .name = "DC10(old)",
                 .i2c_decoder = "vpx3220a",
-                .mod_decoder = "vpx3220",
                 .addrs_decoder = vpx3220_addrs,
                 .video_codec = CODEC_TYPE_ZR36050,
                 .video_vfe = CODEC_TYPE_ZR36016,
@@ -409,10 +408,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = DC10_new,
                 .name = "DC10(new)",
                 .i2c_decoder = "saa7110",
-                .mod_decoder = "saa7110",
                 .addrs_decoder = saa7110_addrs,
                 .i2c_encoder = "adv7175",
-                .mod_encoder = "adv7175",
                 .addrs_encoder = adv717x_addrs,
                 .video_codec = CODEC_TYPE_ZR36060,
 
@@ -440,10 +437,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = DC10plus,
                 .name = "DC10plus",
                 .i2c_decoder = "saa7110",
-                .mod_decoder = "saa7110",
                 .addrs_decoder = saa7110_addrs,
                 .i2c_encoder = "adv7175",
-                .mod_encoder = "adv7175",
                 .addrs_encoder = adv717x_addrs,
                 .video_codec = CODEC_TYPE_ZR36060,
 
@@ -472,10 +467,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = DC30,
                 .name = "DC30",
                 .i2c_decoder = "vpx3220a",
-                .mod_decoder = "vpx3220",
                 .addrs_decoder = vpx3220_addrs,
                 .i2c_encoder = "adv7175",
-                .mod_encoder = "adv7175",
                 .addrs_encoder = adv717x_addrs,
                 .video_codec = CODEC_TYPE_ZR36050,
                 .video_vfe = CODEC_TYPE_ZR36016,
@@ -505,10 +498,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = DC30plus,
                 .name = "DC30plus",
                 .i2c_decoder = "vpx3220a",
-                .mod_decoder = "vpx3220",
                 .addrs_decoder = vpx3220_addrs,
                 .i2c_encoder = "adv7175",
-                .mod_encoder = "adv7175",
                 .addrs_encoder = adv717x_addrs,
                 .video_codec = CODEC_TYPE_ZR36050,
                 .video_vfe = CODEC_TYPE_ZR36016,
@@ -538,10 +529,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = LML33,
                 .name = "LML33",
                 .i2c_decoder = "bt819a",
-                .mod_decoder = "bt819",
                 .addrs_decoder = bt819_addrs,
                 .i2c_encoder = "bt856",
-                .mod_encoder = "bt856",
                 .addrs_encoder = bt856_addrs,
                 .video_codec = CODEC_TYPE_ZR36060,
 
@@ -569,10 +558,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = LML33R10,
                 .name = "LML33R10",
                 .i2c_decoder = "saa7114",
-                .mod_decoder = "saa7115",
                 .addrs_decoder = saa7114_addrs,
                 .i2c_encoder = "adv7170",
-                .mod_encoder = "adv7170",
                 .addrs_encoder = adv717x_addrs,
                 .video_codec = CODEC_TYPE_ZR36060,
 
@@ -600,10 +587,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 .type = BUZ,
                 .name = "Buz",
                 .i2c_decoder = "saa7111",
-                .mod_decoder = "saa7115",
                 .addrs_decoder = saa7111_addrs,
                 .i2c_encoder = "saa7185",
-                .mod_encoder = "saa7185",
                 .addrs_encoder = saa7185_addrs,
                 .video_codec = CODEC_TYPE_ZR36060,
 
@@ -633,10 +618,8 @@ static struct card_info zoran_cards[NUM_CARDS] __devinitdata = {
                 /* AverMedia chose not to brand the 6-Eyes. Thus it
                    can't be autodetected, and requires card=x. */
                 .i2c_decoder = "ks0127",
-                .mod_decoder = "ks0127",
                 .addrs_decoder = ks0127_addrs,
                 .i2c_encoder = "bt866",
-                .mod_encoder = "bt866",
                 .addrs_encoder = bt866_addrs,
                 .video_codec = CODEC_TYPE_ZR36060,
 
@@ -1359,13 +1342,13 @@ static int __devinit zoran_probe(struct pci_dev *pdev,
         }
 
         zr->decoder = v4l2_i2c_new_subdev(&zr->v4l2_dev,
-                &zr->i2c_adapter, zr->card.mod_decoder, zr->card.i2c_decoder,
+                &zr->i2c_adapter, NULL, zr->card.i2c_decoder,
                 0, zr->card.addrs_decoder);
 
-        if (zr->card.mod_encoder)
+        if (zr->card.i2c_encoder)
                 zr->encoder = v4l2_i2c_new_subdev(&zr->v4l2_dev,
                         &zr->i2c_adapter,
-                        zr->card.mod_encoder, zr->card.i2c_encoder,
+                        NULL, zr->card.i2c_encoder,
                         0, zr->card.addrs_encoder);
 
         dprintk(2,
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c
index 6f846abee3e4..b02007e42150 100644
--- a/drivers/media/video/zoran/zoran_device.c
+++ b/drivers/media/video/zoran/zoran_device.c
@@ -1470,8 +1470,7 @@ zoran_irq (int             irq,
                     (zr->codec_mode == BUZ_MODE_MOTION_DECOMPRESS ||
                      zr->codec_mode == BUZ_MODE_MOTION_COMPRESS)) {
                         if (zr36067_debug > 1 && (!zr->frame_num || zr->JPEG_error)) {
-                                char sc[] = "0000";
-                                char sv[5];
+                                char sv[BUZ_NUM_STAT_COM + 1];
                                 int i;
 
                                 printk(KERN_INFO
@@ -1481,12 +1480,9 @@ zoran_irq (int             irq,
                                        zr->jpg_settings.field_per_buff,
                                        zr->JPEG_missed);
 
-                                strcpy(sv, sc);
-                                for (i = 0; i < 4; i++) {
-                                        if (le32_to_cpu(zr->stat_com[i]) & 1)
-                                                sv[i] = '1';
-                                }
-                                sv[4] = 0;
+                                for (i = 0; i < BUZ_NUM_STAT_COM; i++)
+                                        sv[i] = le32_to_cpu(zr->stat_com[i]) & 1 ? '1' : '0';
+                                sv[BUZ_NUM_STAT_COM] = 0;
                                 printk(KERN_INFO
                                        "%s: stat_com=%s queue_state=%ld/%ld/%ld/%ld\n",
                                        ZR_DEVNAME(zr), sv,
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 3c471a4e3e4a..401082b853f0 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -3322,7 +3322,7 @@ zoran_mmap (struct file           *file,
 mmap_unlock_and_return:
         mutex_unlock(&zr->resource_lock);
 
-        return 0;
+        return res;
 }
 
 static const struct v4l2_ioctl_ops zoran_ioctl_ops = {