diff --git a/[refs] b/[refs]
index eeb1977a80f9..b6fce0c18f0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbcb86ed945e42e99884e7afaab2f326a2aff2ec
+refs/heads/master: 4263fa8ca6d9f387ce0d005e861f7e945c741e6e
diff --git a/trunk/drivers/media/video/cx25840/cx25840-firmware.c b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
index 18dd3475358e..f59ced181c55 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-firmware.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-firmware.c
@@ -25,7 +25,17 @@
 #include "cx25840-core.h"
 
 #define FWFILE "v4l-cx25840.fw"
-#define FWSEND 1024
+
+/*
+ * Mike Isely <isely@pobox.com> - The FWSEND parameter controls the
+ * size of the firmware chunks sent down the I2C bus to the chip.
+ * Previously this had been set to 1024 but unfortunately some I2C
+ * implementations can't transfer data in such big gulps.
+ * Specifically, the pvrusb2 driver has a hard limit of around 60
+ * bytes, due to the encapsulation there of I2C traffic into USB
+ * messages.  So we have to significantly reduce this parameter.
+ */
+#define FWSEND 48
 
 #define FWDEV(x) &((x)->adapter->dev)