summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2009-03-25 00:30:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:40 -0300
commitdc070bccde5b0ab2f51124bf67e9a3b40a602cba (patch)
tree9f0d3caa25231c536b0de76ee41aba3c88b67db1
parent2a6b627f8b4594987390ac35d3b344a96af3cfc9 (diff)
V4L/DVB (11208): pvrusb2: Use v4l2_device_disconnect()
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index e35772125038..7a65b42a4f53 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2672,10 +2672,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);