diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 3323dffe26a4..eea304f75176 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/version.h> | 30 | #include <linux/version.h> |
31 | #include <linux/video_decoder.h> | 31 | #include <linux/video_decoder.h> |
32 | #include <linux/mutex.h> | ||
32 | 33 | ||
33 | #include "em28xx.h" | 34 | #include "em28xx.h" |
34 | #include <media/tuner.h> | 35 | #include <media/tuner.h> |
@@ -191,7 +192,7 @@ static struct v4l2_queryctrl saa711x_qctrl[] = { | |||
191 | 192 | ||
192 | static struct usb_driver em28xx_usb_driver; | 193 | static struct usb_driver em28xx_usb_driver; |
193 | 194 | ||
194 | static DECLARE_MUTEX(em28xx_sysfs_lock); | 195 | static DEFINE_MUTEX(em28xx_sysfs_lock); |
195 | static DECLARE_RWSEM(em28xx_disconnect); | 196 | static DECLARE_RWSEM(em28xx_disconnect); |
196 | 197 | ||
197 | /********************* v4l2 interface ******************************************/ | 198 | /********************* v4l2 interface ******************************************/ |
@@ -394,7 +395,7 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp) | |||
394 | */ | 395 | */ |
395 | static void em28xx_release_resources(struct em28xx *dev) | 396 | static void em28xx_release_resources(struct em28xx *dev) |
396 | { | 397 | { |
397 | down(&em28xx_sysfs_lock); | 398 | mutex_lock(&em28xx_sysfs_lock); |
398 | 399 | ||
399 | em28xx_info("V4L2 device /dev/video%d deregistered\n", | 400 | em28xx_info("V4L2 device /dev/video%d deregistered\n", |
400 | dev->vdev->minor); | 401 | dev->vdev->minor); |
@@ -403,7 +404,7 @@ static void em28xx_release_resources(struct em28xx *dev) | |||
403 | /* video_unregister_device(dev->vbi_dev); */ | 404 | /* video_unregister_device(dev->vbi_dev); */ |
404 | em28xx_i2c_unregister(dev); | 405 | em28xx_i2c_unregister(dev); |
405 | usb_put_dev(dev->udev); | 406 | usb_put_dev(dev->udev); |
406 | up(&em28xx_sysfs_lock); | 407 | mutex_unlock(&em28xx_sysfs_lock); |
407 | } | 408 | } |
408 | 409 | ||
409 | /* | 410 | /* |