From: Mike Isely <isely@pobox.com>
Date: Wed, 25 Mar 2009 03:30:45 +0000 (-0300)
Subject: V4L/DVB (11208): pvrusb2: Use v4l2_device_disconnect()
X-Git-Tag: firefly_0821_release~15196^2~83
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=dc070bccde5b0ab2f51124bf67e9a3b40a602cba;p=firefly-linux-kernel-4.4.55.git

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 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);