diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-05 15:47:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-05 15:47:50 +0200 |
| commit | 62d2def9a5143ba5c8cd009e7f07e5dfa79830d2 (patch) | |
| tree | 722390bba0b1da0d98bdd686d1837d89c3b10d45 /sound/usb/stream.c | |
| parent | Merge tag 'linux-kselftest-4.6-rc3' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | [media] Revert "[media] media: au0828 change to use Managed Media Controller ... (diff) | |
| download | linux-62d2def9a5143ba5c8cd009e7f07e5dfa79830d2.tar.xz linux-62d2def9a5143ba5c8cd009e7f07e5dfa79830d2.zip | |
Merge tag 'media/v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"Some bug fixes on au0828 and snd-usb-audio:
- the au0828+snd-usb-audio MC patch broke several things and produced
some race conditions. Better to revert the patches, and re-work on
them for a next version
- fix a regression at tuner disable links logic
- properly handle dev_state as a bitmask"
* tag 'media/v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] Revert "[media] media: au0828 change to use Managed Media Controller API"
[media] Revert "[media] sound/usb: Use Media Controller API to share media resources"
[media] au0828: Fix dev_state handling
[media] au0828: fix au0828_v4l2_close() dev_state race condition
[media] media: au0828 fix to clear enable/disable/change source handlers
[media] v4l2-mc: cleanup a warning
[media] au0828: disable tuner links and cache tuner/decoder
Diffstat (limited to 'sound/usb/stream.c')
| -rw-r--r-- | sound/usb/stream.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 6fe7f210bd4e..8e9548bc1f1a 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -36,7 +36,6 @@ #include "format.h" #include "clock.h" #include "stream.h" -#include "media.h" /* * free a substream @@ -53,7 +52,6 @@ static void free_substream(struct snd_usb_substream *subs) kfree(fp); } kfree(subs->rate_list.list); - media_snd_stream_delete(subs); } |