aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2012-08-19 19:32:27 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:28:02 +0900
commit8a6c264be08d9df60b86af8b35ae56336bd625d7 (patch)
tree2b62c7e23ad70ff32d682de270ea47b2aef95131 /drivers/media
parent58e6b5c499e4544164a7ffea278511e32fa488e5 (diff)
downloadkernel_samsung_smdk4412-8a6c264be08d9df60b86af8b35ae56336bd625d7.zip
kernel_samsung_smdk4412-8a6c264be08d9df60b86af8b35ae56336bd625d7.tar.gz
kernel_samsung_smdk4412-8a6c264be08d9df60b86af8b35ae56336bd625d7.tar.bz2
media: rc: ite-cir: Initialise ite_dev::rdev earlier
commit 4b961180ef275035b1538317ffd0e21e80e63e77 upstream. 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(). Reported-and-tested-by: YunQiang Su <wzssyqa@gmail.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/rc/ite-cir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index c5ca091..d8e0b2d8 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -1477,6 +1477,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;
@@ -1608,7 +1609,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;