1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 9be04772c723..bd05ec7b1cbe 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3514,7 +3514,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;
@@ -3537,11 +3537,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;