V4L/DVB (13496): pvrusb2: Support manual extraction of 16KB FX2 firmware

This pvrusb2 change is in support of an existing feature used to help
identify and locate newer vendor supplied firmware.  This change makes
the feature work for the newer larger firmware size.

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

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index 010018bc8383..ae977668c496 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -252,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;
                                 }