diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 20:03:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 20:03:06 -0300 |
| commit | 6b266887b9274e4dc0355be91ca9a44d322a12b2 (patch) | |
| tree | fa2cfb687ba99d466200fce005443f56cd3f327d /linux/drivers/media | |
| parent | 5cc5c2fb8cd1546a22afb5cbeb9ac6130247feb8 (diff) | |
| parent | 2af675418bb28b6297dfe4d592589fcd7a9410f6 (diff) | |
| download | mediapointer-dvb-s2-6b266887b9274e4dc0355be91ca9a44d322a12b2.tar.gz mediapointer-dvb-s2-6b266887b9274e4dc0355be91ca9a44d322a12b2.tar.bz2 | |
merge: http://linuxtv.org/hg/~dheitmueller/950q_oopsfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/au0828/au0828-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/au0828/au0828-core.c b/linux/drivers/media/video/au0828/au0828-core.c index ab25af430..4da5b7909 100644 --- a/linux/drivers/media/video/au0828/au0828-core.c +++ b/linux/drivers/media/video/au0828/au0828-core.c @@ -193,8 +193,6 @@ static int au0828_usb_probe(struct usb_interface *interface, dev->usbdev = usbdev; dev->boardnr = id->driver_info; - usb_set_intfdata(interface, dev); - /* Create the v4l2_device */ retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); if (retval) { @@ -223,6 +221,10 @@ static int au0828_usb_probe(struct usb_interface *interface, /* Digital TV */ au0828_dvb_register(dev); + /* Store the pointer to the au0828_dev so it can be accessed in + au0828_usb_disconnect */ + usb_set_intfdata(interface, dev); + printk(KERN_INFO "Registered device AU0828 [%s]\n", dev->board.name == NULL ? "Unset" : dev->board.name); |