diff options
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
-rw-r--r-- | drivers/media/video/stk-webcam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index 6b1ef5dc562..8dda5680094 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -72,7 +72,7 @@ static void stk_camera_cleanup(struct kref *kref) | |||
72 | STK_INFO("Syntek USB2.0 Camera release resources" | 72 | STK_INFO("Syntek USB2.0 Camera release resources" |
73 | " video device /dev/video%d\n", dev->vdev.minor); | 73 | " video device /dev/video%d\n", dev->vdev.minor); |
74 | video_unregister_device(&dev->vdev); | 74 | video_unregister_device(&dev->vdev); |
75 | dev->vdev.priv = NULL; | 75 | video_set_drvdata(&dev->vdev, NULL); |
76 | 76 | ||
77 | if (dev->sio_bufs != NULL || dev->isobufs != NULL) | 77 | if (dev->sio_bufs != NULL || dev->isobufs != NULL) |
78 | STK_ERROR("We are leaking memory\n"); | 78 | STK_ERROR("We are leaking memory\n"); |
@@ -1379,7 +1379,7 @@ static int stk_register_video_device(struct stk_camera *dev) | |||
1379 | dev->vdev = stk_v4l_data; | 1379 | dev->vdev = stk_v4l_data; |
1380 | dev->vdev.debug = debug; | 1380 | dev->vdev.debug = debug; |
1381 | dev->vdev.parent = &dev->interface->dev; | 1381 | dev->vdev.parent = &dev->interface->dev; |
1382 | dev->vdev.priv = dev; | 1382 | video_set_drvdata(&dev->vdev, dev); |
1383 | err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1); | 1383 | err = video_register_device(&dev->vdev, VFL_TYPE_GRABBER, -1); |
1384 | if (err) | 1384 | if (err) |
1385 | STK_ERROR("v4l registration failed\n"); | 1385 | STK_ERROR("v4l registration failed\n"); |