From 7773d2ae5de2b47cd366c670614b3c9fdd7863f0 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Wed, 25 Mar 2009 00:30:45 -0300 Subject: [PATCH] --- yaml --- r: 138316 b: refs/heads/master c: dc070bccde5b0ab2f51124bf67e9a3b40a602cba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a2f036216001..78acb5cf7baf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a6b627f8b4594987390ac35d3b344a96af3cfc9 +refs/heads/master: dc070bccde5b0ab2f51124bf67e9a3b40a602cba diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c index e35772125038..7a65b42a4f53 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/trunk/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);