rc: ite-cir: Initialise ite_dev::rdev earlier (Closes: #684441)

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

debian/changelog

@@ -90,6 +90,7 @@ linux (3.2.28-1) UNRELEASED; urgency=low
   * rds: set correct msg_namelen (CVE-2012-3430)
   * e1000: add dropped DMA receive enable back in for WoL (Closes: #684618)
   * PCI/PM/Runtime: make PCI traces quieter (Closes: #684049)
+  * rc: ite-cir: Initialise ite_dev::rdev earlier (Closes: #684441)
 
   [ Bastian Blank ]
   * Make xen-linux-system meta-packages depend on xen-system. This allows

debian/patches/bugfix/all/media-rc-ite-cir-Initialise-ite_dev-rdev-earlier.patch

@@ -0,0 +1,36 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 12 Aug 2012 22:47:41 +0100
+Subject: [media] rc: ite-cir: Initialise ite_dev::rdev earlier
+Bug-Debian: http://bugs.debian.org/684441
+
+ite_dev::rdev is currently initialised in ite_probe() after
+rc_register_device() returns.  If a newly registered device is opened
+quickly enough, we may enable interrupts and try to use ite_dev::rdev
+before it has been initialised.  Move it up to the earliest point we
+can, right after calling rc_allocate_device().
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/media/rc/ite-cir.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
+index 0e49c99..c06992e 100644
+--- a/drivers/media/rc/ite-cir.c
++++ b/drivers/media/rc/ite-cir.c
+@@ -1473,6 +1473,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
+ 	rdev = rc_allocate_device();
+ 	if (!rdev)
+ 		goto failure;
++	itdev->rdev = rdev;
+ 
+ 	ret = -ENODEV;
+ 
+@@ -1604,7 +1605,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
+ 	if (ret)
+ 		goto failure;
+ 
+-	itdev->rdev = rdev;
+ 	ite_pr(KERN_NOTICE, "driver has been successfully loaded\n");
+ 
+ 	return 0;

debian/patches/series

@@ -388,3 +388,4 @@ features/all/bql/skge-add-byte-queue-limit-support.patch
 
 bugfix/all/rds-set-correct-msg_namelen.patch
 bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch
+bugfix/all/media-rc-ite-cir-Initialise-ite_dev-rdev-earlier.patch