5 files changed, 84 insertions, 46 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index de943cf6c169..d65d0572403b 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1101,7 +1101,7 @@ struct usb_device_id em28xx_id_table [] = {
         { USB_DEVICE(0xeb1a, 0x2820),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2821),
-                        .driver_info = EM2820_BOARD_UNKNOWN },
+                        .driver_info = EM2820_BOARD_PROLINK_PLAYTV_USB2 },
         { USB_DEVICE(0xeb1a, 0x2860),
                         .driver_info = EM2820_BOARD_UNKNOWN },
         { USB_DEVICE(0xeb1a, 0x2861),
@@ -1271,7 +1271,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0x1ba50080, EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA, TUNER_ABSENT},
 };
 
-int em28xx_tuner_callback(void *ptr, int command, int arg)
+int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
 {
         int rc = 0;
         struct em28xx *dev = ptr;
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index d2b1a1a52689..c99e2383b7ec 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -249,7 +249,6 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
         memset(&cfg, 0, sizeof(cfg));
         cfg.i2c_adap  = &dev->i2c_adap;
         cfg.i2c_addr  = addr;
-        cfg.callback  = em28xx_tuner_callback;
 
         if (!dev->dvb->frontend) {
                 printk(KERN_ERR "%s/2: dvb frontend not attached. "
@@ -274,7 +273,7 @@ static int attach_xc3028(u8 addr, struct em28xx *dev)
 
 /* ------------------------------------------------------------------ */
 
-int register_dvb(struct em28xx_dvb *dvb,
+static int register_dvb(struct em28xx_dvb *dvb,
                  struct module *module,
                  struct em28xx *dev,
                  struct device *device)
@@ -422,6 +421,8 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+        case EM2880_BOARD_KWORLD_DVB_310U:
                 dvb->frontend = dvb_attach(zl10353_attach,
                                            &em28xx_zl10353_with_xc3028,
                                            &dev->i2c_adap);
@@ -443,24 +444,6 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
 #endif
-        case EM2880_BOARD_TERRATEC_HYBRID_XS:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                         result = -EINVAL;
-                        goto out_free;
-                }
-                break;
-        case EM2880_BOARD_KWORLD_DVB_310U:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                        result = -EINVAL;
-                        goto out_free;
-                }
-                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n",
@@ -474,6 +457,8 @@ static int dvb_init(struct em28xx *dev)
                 result = -EINVAL;
                 goto out_free;
         }
+        /* define general-purpose callback pointer */
+        dvb->frontend->callback = em28xx_tuner_callback;
 
         /* register everything */
         result = register_dvb(dvb, THIS_MODULE, dev, &dev->udev->dev);
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 97853384c943..3bab56b997fc 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -143,10 +143,11 @@ static int em2800_i2c_check_for_device(struct em28xx *dev, unsigned char addr)
         }
         for (write_timeout = EM2800_I2C_WRITE_TIMEOUT; write_timeout > 0;
              write_timeout -= 5) {
-                unsigned msg = dev->em28xx_read_reg(dev, 0x5);
-                if (msg == 0x94)
+                unsigned reg = dev->em28xx_read_reg(dev, 0x5);
+
+                if (reg == 0x94)
                         return -ENODEV;
-                else if (msg == 0x84)
+                else if (reg == 0x84)
                         return 0;
                 msleep(5);
         }
@@ -335,8 +336,11 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
 
         /* Check if board has eeprom */
         err = i2c_master_recv(&dev->i2c_client, &buf, 0);
-        if (err < 0)
-                return -1;
+        if (err < 0) {
+                em28xx_errdev("%s: i2c_master_recv failed! err [%d]\n",
+                        __func__, err);
+                return err;
+        }
 
         buf = 0;
 
@@ -344,7 +348,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
         if (err != 1) {
                 printk(KERN_INFO "%s: Huh, no eeprom present (err=%d)?\n",
                        dev->name, err);
-                return -1;
+                return err;
         }
         while (size > 0) {
                 if (size > 16)
@@ -357,7 +361,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
                         printk(KERN_WARNING
                                "%s: i2c eeprom read error (err=%d)\n",
                                dev->name, err);
-                        return -1;
+                        return err;
                 }
                 size -= block;
                 p += block;
@@ -585,18 +589,31 @@ void em28xx_i2c_call_clients(struct em28xx *dev, unsigned int cmd, void *arg)
  */
 int em28xx_i2c_register(struct em28xx *dev)
 {
+        int retval;
+
         BUG_ON(!dev->em28xx_write_regs || !dev->em28xx_read_reg);
         BUG_ON(!dev->em28xx_write_regs_req || !dev->em28xx_read_reg_req);
         dev->i2c_adap = em28xx_adap_template;
         dev->i2c_adap.dev.parent = &dev->udev->dev;
         strcpy(dev->i2c_adap.name, dev->name);
         dev->i2c_adap.algo_data = dev;
-        i2c_add_adapter(&dev->i2c_adap);
+
+        retval = i2c_add_adapter(&dev->i2c_adap);
+        if (retval < 0) {
+                em28xx_errdev("%s: i2c_add_adapter failed! retval [%d]\n",
+                        __func__, retval);
+                return retval;
+        }
 
         dev->i2c_client = em28xx_client_template;
         dev->i2c_client.adapter = &dev->i2c_adap;
 
-        em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+        retval = em28xx_i2c_eeprom(dev, dev->eedata, sizeof(dev->eedata));
+        if (retval < 0) {
+                em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
+                        __func__, retval);
+                return retval;
+        }
 
         if (i2c_scan)
                 em28xx_do_i2c_scan(dev);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 49ab0629702e..c53649e5315b 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -513,10 +513,17 @@ static struct videobuf_queue_ops em28xx_video_qops = {
  */
 static int em28xx_config(struct em28xx *dev)
 {
+        int retval;
 
         /* Sets I2C speed to 100 KHz */
-        if (!dev->is_em2800)
-                em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+        if (!dev->is_em2800) {
+                retval = em28xx_write_regs_req(dev, 0x00, 0x06, "\x40", 1);
+                if (retval < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req failed! retval [%d]\n",
+                                __func__, retval);
+                        return retval;
+                }
+        }
 
         /* enable vbi capturing */
 
@@ -1512,6 +1519,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         struct em28xx_fh *fh;
         enum v4l2_buf_type fh_type = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &em28xx_devlist, devlist) {
                 if (h->vdev->minor == minor) {
                         dev  = h;
@@ -1527,8 +1535,10 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         em28xx_videodbg("open minor=%d type=%s users=%d\n",
                                 minor, v4l2_type_names[fh_type], dev->users);
@@ -1537,6 +1547,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
         fh = kzalloc(sizeof(struct em28xx_fh), GFP_KERNEL);
         if (!fh) {
                 em28xx_errdev("em28xx-video.c: Out of memory?!\n");
+                unlock_kernel();
                 return -ENOMEM;
         }
         mutex_lock(&dev->lock);
@@ -1573,6 +1584,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
                         sizeof(struct em28xx_buffer), fh);
 
         mutex_unlock(&dev->lock);
+        unlock_kernel();
 
         return errCode;
 }
@@ -1588,8 +1600,7 @@ static void em28xx_release_resources(struct em28xx *dev)
         /*FIXME: I2C IR should be disconnected */
 
         em28xx_info("V4L2 devices /dev/video%d and /dev/vbi%d deregistered\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+                                dev->vdev->num, dev->vbi_dev->num);
         list_del(&dev->devlist);
         if (dev->sbutton_input_dev)
                 em28xx_deregister_snapshot_button(dev);
@@ -1948,13 +1959,23 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         }
 
         /* register i2c bus */
-        em28xx_i2c_register(dev);
+        errCode = em28xx_i2c_register(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_i2c_register - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         /* Do board specific init and eeprom reading */
         em28xx_card_setup(dev);
 
         /* Configure audio */
-        em28xx_audio_analog_set(dev);
+        errCode = em28xx_audio_analog_set(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_audio_analog_set - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         /* configure the device */
         em28xx_config_i2c(dev);
@@ -1974,6 +1995,11 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         dev->ctl_input = 2;
 
         errCode = em28xx_config(dev);
+        if (errCode < 0) {
+                em28xx_errdev("%s: em28xx_config - errCode [%d]!\n",
+                        __func__, errCode);
+                return errCode;
+        }
 
         list_add_tail(&dev->devlist, &em28xx_devlist);
 
@@ -2026,17 +2052,27 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
 
         if (dev->has_msp34xx) {
                 /* Send a reset to other chips via gpio */
-                em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1);
+                if (errCode < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(1) failed! errCode [%d]\n",
+                                __func__, errCode);
+                        return errCode;
+                }
                 msleep(3);
-                em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+
+                errCode = em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1);
+                if (errCode < 0) {
+                        em28xx_errdev("%s: em28xx_write_regs_req - msp34xx(2) failed! errCode [%d]\n",
+                                __func__, errCode);
+                        return errCode;
+                }
                 msleep(3);
         }
 
         video_mux(dev, 0);
 
         em28xx_info("V4L2 device registered as /dev/video%d and /dev/vbi%d\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN,
-                                dev->vbi_dev->minor-MINOR_VFL_TYPE_VBI_MIN);
+                                dev->vdev->num, dev->vbi_dev->num);
 
         mutex_lock(&em28xx_extension_devlist_lock);
         if (!list_empty(&em28xx_extension_devlist)) {
@@ -2236,7 +2272,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                 em28xx_warn
                     ("device /dev/video%d is open! Deregistration and memory "
                      "deallocation are deferred on close.\n",
-                                dev->vdev->minor-MINOR_VFL_TYPE_GRABBER_MIN);
+                                dev->vdev->num);
 
                 dev->state |= DEV_MISCONFIGURED;
                 em28xx_uninit_isoc(dev);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 9a3310748685..82781178e0a3 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -411,8 +411,8 @@ struct em28xx {
         /* frame properties */
         int width;              /* current frame width */
         int height;             /* current frame height */
-        int hscale;             /* horizontal scale factor (see datasheet) */
-        int vscale;             /* vertical scale factor (see datasheet) */
+        unsigned hscale;        /* horizontal scale factor (see datasheet) */
+        unsigned vscale;        /* vertical scale factor (see datasheet) */
         int interlaced;         /* 1=interlace fileds, 0=just top fileds */
         unsigned int video_bytesread;   /* Number of bytes read */
 
@@ -528,7 +528,7 @@ extern struct em28xx_board em28xx_boards[];
 extern struct usb_device_id em28xx_id_table[];
 extern const unsigned int em28xx_bcount;
 void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
-int em28xx_tuner_callback(void *ptr, int command, int arg);
+int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
 
 /* Provided by em28xx-input.c */
 /* TODO: Check if the standard get_key handlers on ir-common can be used */