9 files changed, 92 insertions, 26 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index fbe3856bdca6..ae977668c496 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -142,6 +142,9 @@ int pvr2_debugifc_print_info(struct pvr2_hdw *hdw,char *buf,unsigned int acnt)
 {
         int bcnt = 0;
         int ccnt;
+        ccnt = scnprintf(buf, acnt, "Driver hardware description: %s\n",
+                         pvr2_hdw_get_desc(hdw));
+        bcnt += ccnt; acnt -= ccnt; buf += ccnt;
         ccnt = scnprintf(buf,acnt,"Driver state info:\n");
         bcnt += ccnt; acnt -= ccnt; buf += ccnt;
         ccnt = pvr2_hdw_state_report(hdw,buf,acnt);
@@ -249,11 +252,15 @@ static int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,
                         scnt = debugifc_isolate_word(buf,count,&wptr,&wlen);
                         if (scnt && wptr) {
                                 count -= scnt; buf += scnt;
-                                if (debugifc_match_keyword(wptr,wlen,"prom")) {
-                                        pvr2_hdw_cpufw_set_enabled(hdw,!0,!0);
-                                } else if (debugifc_match_keyword(wptr,wlen,
-                                                                  "ram")) {
-                                        pvr2_hdw_cpufw_set_enabled(hdw,0,!0);
+                                if (debugifc_match_keyword(wptr, wlen,
+                                                           "prom")) {
+                                        pvr2_hdw_cpufw_set_enabled(hdw, 2, !0);
+                                } else if (debugifc_match_keyword(wptr, wlen,
+                                                                  "ram8k")) {
+                                        pvr2_hdw_cpufw_set_enabled(hdw, 0, !0);
+                                } else if (debugifc_match_keyword(wptr, wlen,
+                                                                  "ram16k")) {
+                                        pvr2_hdw_cpufw_set_enabled(hdw, 1, !0);
                                 } else {
                                         return -EINVAL;
                                 }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index e4d7c13cab87..6bc16c13ccef 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -58,7 +58,7 @@ static const char *pvr2_fw1_names_29xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_29xxx = {
-                .description = "WinTV PVR USB2 Model Category 29xxx",
+                .description = "WinTV PVR USB2 Model 29xxx",
                 .shortname = "29xxx",
                 .client_table.lst = pvr2_cli_29xxx,
                 .client_table.cnt = ARRAY_SIZE(pvr2_cli_29xxx),
@@ -91,7 +91,7 @@ static const char *pvr2_fw1_names_24xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_24xxx = {
-                .description = "WinTV PVR USB2 Model Category 24xxx",
+                .description = "WinTV PVR USB2 Model 24xxx",
                 .shortname = "24xxx",
                 .client_table.lst = pvr2_cli_24xxx,
                 .client_table.cnt = ARRAY_SIZE(pvr2_cli_24xxx),
@@ -340,7 +340,7 @@ static const char *pvr2_fw1_names_73xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_73xxx = {
-                .description = "WinTV HVR-1900 Model Category 73xxx",
+                .description = "WinTV HVR-1900 Model 73xxx",
                 .shortname = "73xxx",
                 .client_table.lst = pvr2_cli_73xxx,
                 .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx),
@@ -351,6 +351,7 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
                 .flag_has_analogtuner = !0,
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
+                .flag_fx2_16kb = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
@@ -445,7 +446,7 @@ static const char *pvr2_fw1_names_75xxx[] = {
 };
 
 static const struct pvr2_device_desc pvr2_device_750xx = {
-                .description = "WinTV HVR-1950 Model Category 750xx",
+                .description = "WinTV HVR-1950 Model 750xx",
                 .shortname = "750xx",
                 .client_table.lst = pvr2_cli_73xxx,
                 .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx),
@@ -456,6 +457,7 @@ static const struct pvr2_device_desc pvr2_device_750xx = {
                 .flag_has_analogtuner = !0,
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
+                .flag_fx2_16kb = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .default_std_mask = V4L2_STD_NTSC_M,
@@ -467,7 +469,7 @@ static const struct pvr2_device_desc pvr2_device_750xx = {
 };
 
 static const struct pvr2_device_desc pvr2_device_751xx = {
-                .description = "WinTV HVR-1950 Model Category 751xx",
+                .description = "WinTV HVR-1950 Model 751xx",
                 .shortname = "751xx",
                 .client_table.lst = pvr2_cli_73xxx,
                 .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx),
@@ -478,6 +480,7 @@ static const struct pvr2_device_desc pvr2_device_751xx = {
                 .flag_has_analogtuner = !0,
                 .flag_has_composite = !0,
                 .flag_has_svideo = !0,
+                .flag_fx2_16kb = !0,
                 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
                 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
                 .default_std_mask = V4L2_STD_NTSC_M,
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index ea04ecf8aa39..e5b9594eb5f6 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -176,6 +176,7 @@ struct pvr2_device_desc {
         unsigned int flag_has_analogtuner:1;   /* Has analog tuner */
         unsigned int flag_has_composite:1;     /* Has composite input */
         unsigned int flag_has_svideo:1;        /* Has s-video input */
+        unsigned int flag_fx2_16kb:1;          /* 16KB FX2 firmware OK here */
 };
 
 extern struct usb_device_id pvr2_device_table[];
diff --git a/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 54ac5349dee2..e046fdaec5ae 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -294,7 +294,10 @@ static int pvr2_encoder_cmd(void *ctxt,
                         pvr2_trace(
                                 PVR2_TRACE_ERROR_LEGS,
                                 "Giving up on command."
-                                "  This is normally recovered by the driver.");
+                                "  This is normally recovered via a firmware"
+                                " reload and re-initialization; concern"
+                                " is only warranted if this happens repeatedly"
+                                " and rapidly.");
                         break;
                 }
                 wrData[0] = 0x7;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 5fcad28211d2..de5485f506b1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -270,6 +270,7 @@ struct pvr2_hdw {
 
         int force_dirty;        /* consider all controls dirty if true */
         int flag_ok;            /* device in known good state */
+        int flag_modulefail;    /* true if at least one module failed to load */
         int flag_disconnected;  /* flag_ok == 0 due to disconnect */
         int flag_init_ok;       /* true if structure is fully initialized */
         int fw1_state;          /* current situation with fw1 */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 13639b302700..1bbdab08fe0e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1447,6 +1447,7 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
         const struct firmware *fw_entry = NULL;
         void  *fw_ptr;
         unsigned int pipe;
+        unsigned int fwsize;
         int ret;
         u16 address;
 
@@ -1473,9 +1474,21 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
         usb_clear_halt(hdw->usb_dev, usb_sndbulkpipe(hdw->usb_dev, 0 & 0x7f));
 
         pipe = usb_sndctrlpipe(hdw->usb_dev, 0);
+        fwsize = fw_entry->size;
 
-        if (fw_entry->size != 0x2000){
-                pvr2_trace(PVR2_TRACE_ERROR_LEGS,"wrong fx2 firmware size");
+        if ((fwsize != 0x2000) &&
+            (!(hdw->hdw_desc->flag_fx2_16kb && (fwsize == 0x4000)))) {
+                if (hdw->hdw_desc->flag_fx2_16kb) {
+                        pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                                   "Wrong fx2 firmware size"
+                                   " (expected 8192 or 16384, got %u)",
+                                   fwsize);
+                } else {
+                        pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                                   "Wrong fx2 firmware size"
+                                   " (expected 8192, got %u)",
+                                   fwsize);
+                }
                 release_firmware(fw_entry);
                 return -ENOMEM;
         }
@@ -1493,7 +1506,7 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
            chunk. */
 
         ret = 0;
-        for(address = 0; address < fw_entry->size; address += 0x800) {
+        for (address = 0; address < fwsize; address += 0x800) {
                 memcpy(fw_ptr, fw_entry->data + address, 0x800);
                 ret += usb_control_msg(hdw->usb_dev, pipe, 0xa0, 0x40, address,
                                        0, fw_ptr, 0x800, HZ);
@@ -1509,8 +1522,8 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
 
         trace_firmware("Upload done (%d bytes sent)",ret);
 
-        /* We should have written 8192 bytes */
-        if (ret == 8192) {
+        /* We should have written fwsize bytes */
+        if (ret == fwsize) {
                 hdw->fw1_state = FW1_STATE_RELOAD;
                 return 0;
         }
@@ -2030,7 +2043,8 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
         fname = (mid < ARRAY_SIZE(module_names)) ? module_names[mid] : NULL;
         if (!fname) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
-                           "Module ID %u for device %s has no name",
+                           "Module ID %u for device %s has no name?"
+                           "  The driver might have a configuration problem.",
                            mid,
                            hdw->hdw_desc->description);
                 return -EINVAL;
@@ -2058,7 +2072,8 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
         if (!i2ccnt) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                            "Module ID %u (%s) for device %s:"
-                           " No i2c addresses",
+                           " No i2c addresses."
+                           "  The driver might have a configuration problem.",
                            mid, fname, hdw->hdw_desc->description);
                 return -EINVAL;
         }
@@ -2090,7 +2105,9 @@ static int pvr2_hdw_load_subdev(struct pvr2_hdw *hdw,
 
         if (!sd) {
                 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
-                           "Module ID %u (%s) for device %s failed to load",
+                           "Module ID %u (%s) for device %s failed to load."
+                           "  Possible missing sub-device kernel module or"
+                           " initialization failure within module.",
                            mid, fname, hdw->hdw_desc->description);
                 return -EIO;
         }
@@ -2132,7 +2149,10 @@ static void pvr2_hdw_load_modules(struct pvr2_hdw *hdw)
         for (idx = 0; idx < ct->cnt; idx++) {
                 if (pvr2_hdw_load_subdev(hdw, &ct->lst[idx]) < 0) okFl = 0;
         }
-        if (!okFl) pvr2_hdw_render_useless(hdw);
+        if (!okFl) {
+                hdw->flag_modulefail = !0;
+                pvr2_hdw_render_useless(hdw);
+        }
 }
 
 
@@ -2334,6 +2354,20 @@ static void pvr2_hdw_setup(struct pvr2_hdw *hdw)
                                 break;
                         }
                 }
+                if (hdw->flag_modulefail) {
+                        pvr2_trace(
+                                PVR2_TRACE_ERROR_LEGS,
+                                "***WARNING*** pvrusb2 driver initialization"
+                                " failed due to the failure of one or more"
+                                " sub-device kernel modules.");
+                        pvr2_trace(
+                                PVR2_TRACE_ERROR_LEGS,
+                                "You need to resolve the failing condition"
+                                " before this driver can function.  There"
+                                " should be some earlier messages giving more"
+                                " information about the problem.");
+                        break;
+                }
                 if (procreload) {
                         pvr2_trace(
                                 PVR2_TRACE_ERROR_LEGS,
@@ -2419,6 +2453,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
         hdw = kzalloc(sizeof(*hdw),GFP_KERNEL);
         pvr2_trace(PVR2_TRACE_INIT,"pvr2_hdw_create: hdw=%p, type \"%s\"",
                    hdw,hdw_desc->description);
+        pvr2_trace(PVR2_TRACE_INFO, "Hardware description: %s",
+                hdw_desc->description);
         if (!hdw) goto fail;
 
         init_timer(&hdw->quiescent_timer);
@@ -3480,7 +3516,7 @@ static u8 *pvr2_full_eeprom_fetch(struct pvr2_hdw *hdw)
 
 
 void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
-                                int prom_flag,
+                                int mode,
                                 int enable_flag)
 {
         int ret;
@@ -3503,11 +3539,12 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
                         break;
                 }
 
-                hdw->fw_cpu_flag = (prom_flag == 0);
+                hdw->fw_cpu_flag = (mode != 2);
                 if (hdw->fw_cpu_flag) {
+                        hdw->fw_size = (mode == 1) ? 0x4000 : 0x2000;
                         pvr2_trace(PVR2_TRACE_FIRMWARE,
-                                   "Preparing to suck out CPU firmware");
-                        hdw->fw_size = 0x2000;
+                                   "Preparing to suck out CPU firmware"
+                                   " (size=%u)", hdw->fw_size);
                         hdw->fw_buffer = kzalloc(hdw->fw_size,GFP_KERNEL);
                         if (!hdw->fw_buffer) {
                                 hdw->fw_size = 0;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 7b6940554e9a..56e70eae20c1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -219,7 +219,7 @@ int pvr2_hdw_get_stdenum_value(struct pvr2_hdw *hdw,struct v4l2_standard *std,
    this may prevent the device from running (and leaving this mode may
    imply a device reset). */
 void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *,
-                                int prom_flag,
+                                int mode, /* 0=8KB FX2, 1=16KB FX2, 2=PROM */
                                 int enable_flag);
 
 /* Return true if we're in a mode for retrieval CPU firmware */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index a334b1a966a2..7cbe18c4ca95 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -50,6 +50,7 @@ MODULE_PARM_DESC(disable_autoload_ir_video,
 
 /* Mapping of IR schemes to known I2C addresses - if any */
 static const unsigned char ir_video_addresses[] = {
+        [PVR2_IR_SCHEME_ZILOG] = 0x71,
         [PVR2_IR_SCHEME_29XXX] = 0x18,
         [PVR2_IR_SCHEME_24XXX] = 0x18,
 };
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 2d8825e5b1be..6aa48e0ae731 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -913,6 +913,15 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
 }
 
 
+static void pvr2_v4l2_dev_disassociate_parent(struct pvr2_v4l2_dev *dip)
+{
+        if (!dip) return;
+        if (!dip->devbase.parent) return;
+        dip->devbase.parent = NULL;
+        device_move(&dip->devbase.dev, NULL, DPM_ORDER_NONE);
+}
+
+
 static void pvr2_v4l2_destroy_no_lock(struct pvr2_v4l2 *vp)
 {
         if (vp->dev_video) {
@@ -943,6 +952,8 @@ static void pvr2_v4l2_internal_check(struct pvr2_channel *chp)
         struct pvr2_v4l2 *vp;
         vp = container_of(chp,struct pvr2_v4l2,channel);
         if (!vp->channel.mc_head->disconnect_flag) return;
+        pvr2_v4l2_dev_disassociate_parent(vp->dev_video);
+        pvr2_v4l2_dev_disassociate_parent(vp->dev_radio);
         if (vp->vfirst) return;
         pvr2_v4l2_destroy_no_lock(vp);
 }
@@ -1250,12 +1261,13 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
                                struct pvr2_v4l2 *vp,
                                int v4l_type)
 {
+        struct usb_device *usbdev;
         int mindevnum;
         int unit_number;
         int *nr_ptr = NULL;
         dip->v4lp = vp;
 
-
+        usbdev = pvr2_hdw_get_dev(vp->channel.mc_head->hdw);
         dip->v4l_type = v4l_type;
         switch (v4l_type) {
         case VFL_TYPE_GRABBER:
@@ -1296,6 +1308,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
         if (nr_ptr && (unit_number >= 0) && (unit_number < PVR_NUM)) {
                 mindevnum = nr_ptr[unit_number];
         }
+        dip->devbase.parent = &usbdev->dev;
         if ((video_register_device(&dip->devbase,
                                    dip->v4l_type, mindevnum) < 0) &&
             (video_register_device(&dip->devbase,