V4L/DVB (6696): pvrusb2: Miscellaneous tweaks for controlling tuner type and video standard

Correctly mark when a tuner type is set.  Report more faithfully
information about known supported device video standards.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index 45cbca0143ca..5ef005947b04 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -144,6 +144,7 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
         trace_eeprom("serial_number=%d",tvdata.serial_number);
         trace_eeprom("rev_str=%s",tvdata.rev_str);
         hdw->tuner_type = tvdata.tuner_type;
+        hdw->tuner_updated = !0;
         hdw->serial_number = tvdata.serial_number;
         hdw->std_mask_eeprom = tvdata.tuner_formats;
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 4ffaf3faff5b..6a7b9af55e43 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1093,7 +1093,10 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
 
         if (!hdw->hdw_desc->fx2_firmware.cnt) {
                 hdw->fw1_state = FW1_STATE_OK;
-                return 0;
+                pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                           "Connected device type defines"
+                           " no firmware to upload; ignoring firmware");
+                return -ENOTTY;
         }
 
         hdw->fw1_state = FW1_STATE_FAILED; // default result
@@ -1524,7 +1527,8 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)
 
         bcnt = pvr2_std_id_to_str(buf,sizeof(buf),hdw->std_mask_eeprom);
         pvr2_trace(PVR2_TRACE_STD,
-                   "Supported video standard(s) reported by eeprom: %.*s",
+                   "Supported video standard(s) reported available"
+                   " in hardware: %.*s",
                    bcnt,buf);
 
         hdw->std_mask_avail = hdw->std_mask_eeprom;
@@ -1682,9 +1686,9 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
                 pvr2_trace(PVR2_TRACE_INIT,
                            "pvr2_hdw_setup: Tuner type overridden to %d",
                            hdw->tuner_type);
+                hdw->tuner_updated = !0;
         }
 
-        hdw->tuner_updated = !0;
         pvr2_i2c_core_check_stale(hdw);
         hdw->tuner_updated = 0;