1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/media/video/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c
index 0b2dceb74108..1a5f7d0ead41 100644
--- a/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/drivers/media/video/cx25840/cx25840-firmware.c
@@ -25,6 +25,7 @@
 
 #define FWFILE "v4l-cx25840.fw"
 #define FWFILE_CX23885 "v4l-cx23885-avcore-01.fw"
+#define FWFILE_CX231XX "v4l-cx231xx-avcore-01.fw"
 
 /*
  * Mike Isely <isely@pobox.com> - The FWSEND parameter controls the
@@ -96,9 +97,17 @@ int cx25840_loadfw(struct i2c_client *client)
         u8 buffer[FWSEND];
         const u8 *ptr;
         int size, retval;
+    int MAX_BUF_SIZE = FWSEND;
 
         if (state->is_cx23885)
                 firmware = FWFILE_CX23885;
+    else if ( state->is_cx231xx)
+        firmware = FWFILE_CX231XX;
+
+    if( (state->is_cx231xx) && MAX_BUF_SIZE > 16) {
+         printk(" Firmware download size changed to 16 bytes max length\n");
+         MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */
+    }
 
         if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
                 v4l_err(client, "unable to open firmware %s\n", firmware);
@@ -113,7 +122,7 @@ int cx25840_loadfw(struct i2c_client *client)
         size = fw->size;
         ptr = fw->data;
         while (size > 0) {
-                int len = min(FWSEND - 2, size);
+                int len = min(MAX_BUF_SIZE - 2, size);
 
                 memcpy(buffer + 2, ptr, len);