Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 03:43:03 +00:00
Code Issues Projects Releases Wiki Activity

msm: usbaudio: remove usbaudiosdev switch

Browse source 
Remove usbaudiosdev switch to avoid reporting
analog dock headset for USB headset.

Change-Id: Ib5f505385742b708a98f13ab6fd98808b6d1803e
Signed-off-by: Mingming Yin <mingming@codeaurora.org>
This commit is contained in:
Mingming Yin 2014-09-11 12:23:57 -07:00
parent 3511ae2ac1
commit 61e8619937
1 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sound/usb/card.c
View file

@ -45,7 +45,6 @@
#include <linux/usb/audio.h>
#include <linux/usb/audio-v2.h>
#include <linux/module.h>
#include <linux/switch.h>
#include <sound/control.h>
#include <sound/core.h>
@ -84,7 +83,6 @@ static int nrpacks = 8; /* max. number of packets per urb */
static int device_setup[SNDRV_CARDS]; /* device parameter for this card */
static bool ignore_ctl_error;
static bool autoclock = true;
struct switch_dev *usbaudiosdev;
module_param_array(index, int, NULL, 0444);
MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
@ -308,7 +306,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
break;
}
}
switch_set_state(usbaudiosdev, 1);
return 0;
}
@ -633,7 +630,6 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
} else {
mutex_unlock(&register_mutex);
}
switch_set_state(usbaudiosdev, 0);
}
/*
@ -771,32 +767,17 @@ static struct usb_driver usb_audio_driver = {
static int __init snd_usb_audio_init(void)
{
int err;
if (nrpacks < 1 || nrpacks > MAX_PACKS) {
printk(KERN_WARNING "invalid nrpacks value.\n");
return -EINVAL;
}
usbaudiosdev = kzalloc(sizeof(*usbaudiosdev), GFP_KERNEL);
if (!usbaudiosdev) {
pr_err("Usb audio device memory allocation failed.\n");
return -ENOMEM;
}
usbaudiosdev->name = "usb_audio";
err = switch_dev_register(usbaudiosdev);
if (err)
pr_err("Usb-audio switch registration failed\n");
else
pr_debug("usb hs_detected\n");
return usb_register(&usb_audio_driver);
}
static void __exit snd_usb_audio_cleanup(void)
{
usb_deregister(&usb_audio_driver);
kfree(usbaudiosdev);
}
module_init(snd_usb_audio_init);