summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2009-03-24 22:30:45 -0500
committerMike Isely <isely@pobox.com>2009-03-24 22:30:45 -0500
commita69b6e2b1b07aa24a584f25b078452518aec72a9 (patch)
tree79eabed8d1b4f1f9a15eeaebf0c8d79d8a84387e
parent7bf1b26abd6ac7e886d6a82096d7fd18957f6e7c (diff)
downloadmediapointer-dvb-s2-a69b6e2b1b07aa24a584f25b078452518aec72a9.tar.gz
mediapointer-dvb-s2-a69b6e2b1b07aa24a584f25b078452518aec72a9.tar.bz2
pvrusb2: Use v4l2_device_disconnect()
From: Mike Isely <isely@pobox.com> Priority: normal Signed-off-by: Mike Isely <isely@pobox.com>
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 2e21181c3..bea17cd64 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2694,10 +2694,7 @@ static void pvr2_hdw_remove_usb_stuff(struct pvr2_hdw *hdw)
/* If we don't do this, then there will be a dangling struct device
reference to our disappearing device persisting inside the V4L
core... */
- if (hdw->v4l2_dev.dev) {
- dev_set_drvdata(hdw->v4l2_dev.dev, NULL);
- hdw->v4l2_dev.dev = NULL;
- }
+ v4l2_device_disconnect(&hdw->v4l2_dev);
hdw->usb_dev = NULL;
hdw->usb_intf = NULL;
pvr2_hdw_render_useless(hdw);