diff options
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-audio.c')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-audio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c index e881ef7b6445..957c7ae30efe 100644 --- a/drivers/media/usb/em28xx/em28xx-audio.c +++ b/drivers/media/usb/em28xx/em28xx-audio.c | |||
@@ -268,7 +268,7 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream) | |||
268 | nonblock = !!(substream->f_flags & O_NONBLOCK); | 268 | nonblock = !!(substream->f_flags & O_NONBLOCK); |
269 | if (nonblock) { | 269 | if (nonblock) { |
270 | if (!mutex_trylock(&dev->lock)) | 270 | if (!mutex_trylock(&dev->lock)) |
271 | return -EAGAIN; | 271 | return -EAGAIN; |
272 | } else | 272 | } else |
273 | mutex_lock(&dev->lock); | 273 | mutex_lock(&dev->lock); |
274 | 274 | ||
@@ -893,7 +893,7 @@ static int em28xx_audio_init(struct em28xx *dev) | |||
893 | static int devnr; | 893 | static int devnr; |
894 | int err; | 894 | int err; |
895 | 895 | ||
896 | if (!dev->has_alsa_audio) { | 896 | if (dev->usb_audio_type != EM28XX_USB_AUDIO_VENDOR) { |
897 | /* This device does not support the extension (in this case | 897 | /* This device does not support the extension (in this case |
898 | the device is expecting the snd-usb-audio module or | 898 | the device is expecting the snd-usb-audio module or |
899 | doesn't have analog audio support at all) */ | 899 | doesn't have analog audio support at all) */ |
@@ -975,7 +975,7 @@ static int em28xx_audio_fini(struct em28xx *dev) | |||
975 | if (dev == NULL) | 975 | if (dev == NULL) |
976 | return 0; | 976 | return 0; |
977 | 977 | ||
978 | if (!dev->has_alsa_audio) { | 978 | if (dev->usb_audio_type != EM28XX_USB_AUDIO_VENDOR) { |
979 | /* This device does not support the extension (in this case | 979 | /* This device does not support the extension (in this case |
980 | the device is expecting the snd-usb-audio module or | 980 | the device is expecting the snd-usb-audio module or |
981 | doesn't have analog audio support at all) */ | 981 | doesn't have analog audio support at all) */ |
@@ -1003,7 +1003,7 @@ static int em28xx_audio_suspend(struct em28xx *dev) | |||
1003 | if (dev == NULL) | 1003 | if (dev == NULL) |
1004 | return 0; | 1004 | return 0; |
1005 | 1005 | ||
1006 | if (!dev->has_alsa_audio) | 1006 | if (dev->usb_audio_type != EM28XX_USB_AUDIO_VENDOR) |
1007 | return 0; | 1007 | return 0; |
1008 | 1008 | ||
1009 | em28xx_info("Suspending audio extension"); | 1009 | em28xx_info("Suspending audio extension"); |
@@ -1017,7 +1017,7 @@ static int em28xx_audio_resume(struct em28xx *dev) | |||
1017 | if (dev == NULL) | 1017 | if (dev == NULL) |
1018 | return 0; | 1018 | return 0; |
1019 | 1019 | ||
1020 | if (!dev->has_alsa_audio) | 1020 | if (dev->usb_audio_type != EM28XX_USB_AUDIO_VENDOR) |
1021 | return 0; | 1021 | return 0; |
1022 | 1022 | ||
1023 | em28xx_info("Resuming audio extension"); | 1023 | em28xx_info("Resuming audio extension"); |