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>

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index e35772125038d45d5bd8f544bf38d332b3a88724..7a65b42a4f53571abdba88c11d36bd83c7fad011 100644 (file)
--- 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);