android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from zeusk/patch-1

Browse Source 
revert ics patch for htc headset, should fix audio lockup in cm7
This commit is contained in:
zeusk 2012-03-07 07:30:51 -08:00
commit acd1c1032f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-msm/htc_headset_mgr.c
View File

@ -368,12 +368,12 @@ static void remove_35mm_do_work(struct work_struct *work)
if (hi->usb_dev_type == USB_HEADSET) {
hi->usb_dev_status = STATUS_CONNECTED_ENABLED;
state &= ~BIT_HEADSET;
state &= ~(BIT_35MM_HEADSET | BIT_HEADSET);
state |= BIT_HEADSET_NO_MIC;
switch_set_state(&hi->sdev, state);
mutex_unlock(&hi->mutex_lock);
} else if (hi->usb_dev_type == H2W_TVOUT) {
state &= ~BIT_HEADSET;
state &= ~(BIT_HEADSET | BIT_35MM_HEADSET);
state |= BIT_HEADSET_NO_MIC;
switch_set_state(&hi->sdev, state);
#if 0
@ -384,7 +384,7 @@ static void remove_35mm_do_work(struct work_struct *work)
HS_DELAY_ZERO_JIFFIES);
#endif
} else {
state &= ~(BIT_HEADSET | BIT_HEADSET_NO_MIC);
state &= ~(BIT_HEADSET | BIT_HEADSET_NO_MIC | BIT_35MM_HEADSET);
switch_set_state(&hi->sdev, state);
}
@ -446,7 +446,7 @@ static void insert_35mm_do_work(struct work_struct *work)
state |= BIT_HEADSET;
printk(KERN_INFO "3.5mm_headset with microphone\n");
}
state |= BIT_35MM_HEADSET;
switch_set_state(&hi->sdev, state);
if (state & BIT_HEADSET_NO_MIC)
hi->ext_35mm_status = HTC_35MM_NO_MIC;