aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-devattr.c1
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index bd3b7932f23e..6bc16c13ccef 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -351,6 +351,7 @@ static const struct pvr2_device_desc pvr2_device_73xxx = {
351 .flag_has_analogtuner = !0, 351 .flag_has_analogtuner = !0,
352 .flag_has_composite = !0, 352 .flag_has_composite = !0,
353 .flag_has_svideo = !0, 353 .flag_has_svideo = !0,
354 .flag_fx2_16kb = !0,
354 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, 355 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
355 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE, 356 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
356 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE, 357 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index e93f3e2c25e7..1bbdab08fe0e 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1522,8 +1522,8 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
1522 1522
1523 trace_firmware("Upload done (%d bytes sent)",ret); 1523 trace_firmware("Upload done (%d bytes sent)",ret);
1524 1524
1525 /* We should have written 8192 bytes */ 1525 /* We should have written fwsize bytes */
1526 if (ret == 8192) { 1526 if (ret == fwsize) {
1527 hdw->fw1_state = FW1_STATE_RELOAD; 1527 hdw->fw1_state = FW1_STATE_RELOAD;
1528 return 0; 1528 return 0;
1529 } 1529 }