diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-09 17:41:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-09 17:41:41 -0400 |
| commit | ae95d7126104591348d37aaf78c8325967e02386 (patch) | |
| tree | 3270712f030549d77d4c55246d056e02b9def29d /sound/usb/card.c | |
| parent | 03c5b534185f9844c1b5fcfdbae2adc32821ec42 (diff) | |
| parent | 183c948a3cb3efbf45eabed41fa7ee04c19378fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'sound/usb/card.c')
| -rw-r--r-- | sound/usb/card.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 63244bbba8c7..3fc63583a537 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -66,7 +66,6 @@ #include "format.h" #include "power.h" #include "stream.h" -#include "media.h" MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>"); MODULE_DESCRIPTION("USB Audio"); @@ -612,11 +611,6 @@ static int usb_audio_probe(struct usb_interface *intf, if (err < 0) goto __error; - if (quirk->media_device) { - /* don't want to fail when media_snd_device_create() fails */ - media_snd_device_create(chip, intf); - } - usb_chip[chip->index] = chip; chip->num_interfaces++; usb_set_intfdata(intf, chip); @@ -673,14 +667,6 @@ static void usb_audio_disconnect(struct usb_interface *intf) list_for_each(p, &chip->midi_list) { snd_usbmidi_disconnect(p); } - /* - * Nice to check quirk && quirk->media_device - * need some special handlings. Doesn't look like - * we have access to quirk here - * Acceses mixer_list - */ - media_snd_device_delete(chip); - /* release mixer resources */ list_for_each_entry(mixer, &chip->mixer_list, list) { snd_usb_mixer_disconnect(mixer); |