media/cxd2820r_core: Fix regression in 3.12.3, thanks to Frederik Himpe

svn path=/dists/sid/linux/; revision=20896

debian/changelog

@@ -53,6 +53,7 @@ linux (3.12.5-1) UNRELEASED; urgency=medium
     (Closes: #732106)
   * linux-source: Compress with gzip -1 (Closes: #725492)
   * [alpha] Prevent a NULL ptr dereference in csum_partial_copy
+  * media/cxd2820r_core: Fix regression in 3.12.3, thanks to Frederik Himpe
 
   [ Ian Campbell ]
   * [armel/kirkwood+orion] Reenable MARVELL_PHY (Closes: #723177)

debian/patches/bugfix/all/media-cxd2820r_core-fix-sparse-warnings.patch

@@ -0,0 +1,39 @@
+From: Hans Verkuil <hans.verkuil@cisco.com>
+Date: Fri, 4 Oct 2013 11:01:43 -0300
+Subject: [media] cxd2820r_core: fix sparse warnings
+Origin: https://git.kernel.org/linus/0db3fa2741ad8371c21b3a6785416a4afc0cc1d4
+
+drivers/media/dvb-frontends/cxd2820r_core.c:34:32: error: cannot size expression
+drivers/media/dvb-frontends/cxd2820r_core.c:68:32: error: cannot size expression
+
+Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
+Acked-by: Antti Palosaari <crope@iki.fi>
+Reviewed-by: Antti Palosaari <crope@iki.fi>
+Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+[bwh: Commit 8393796dfa4c ('media: dvb-frontends: Don't use dynamic static
+ allocation') depends on this but was cherry-picked for 3.12.3 without this]
+---
+ drivers/media/dvb-frontends/cxd2820r_core.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/media/dvb-frontends/cxd2820r_core.c
++++ b/drivers/media/dvb-frontends/cxd2820r_core.c
+@@ -34,7 +34,7 @@ static int cxd2820r_wr_regs_i2c(struct c
+ 		{
+ 			.addr = i2c,
+ 			.flags = 0,
+-			.len = sizeof(buf),
++			.len = len + 1,
+ 			.buf = buf,
+ 		}
+ 	};
+@@ -75,7 +75,7 @@ static int cxd2820r_rd_regs_i2c(struct c
+ 		}, {
+ 			.addr = i2c,
+ 			.flags = I2C_M_RD,
+-			.len = sizeof(buf),
++			.len = len,
+ 			.buf = buf,
+ 		}
+ 	};

debian/patches/series

@@ -82,3 +82,4 @@ bugfix/arm/ahci-imx-Explicitly-clear-IMX6Q_GPR13_SATA_MPLL_CLK_.patch
 bugfix/all/disable-some-marvell-phys.patch
 features/all/media-az6007-support-Technisat-Cablestar-Combo-HDCI-.patch
 bugfix/all/alpha-Prevent-a-NULL-ptr-dereference-in-csum_partial.patch
+bugfix/all/media-cxd2820r_core-fix-sparse-warnings.patch