mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'topic/workq-update' into topic/misc
This commit is contained in:
commit
354d14b3f5
1532 changed files with 28025 additions and 13727 deletions
|
|
@ -287,10 +287,9 @@ static void ftr_gpio_exit(struct gpio_runtime *rt)
|
|||
free_irq(linein_detect_irq, &rt->line_in_notify);
|
||||
if (rt->line_out_notify.gpio_private)
|
||||
free_irq(lineout_detect_irq, &rt->line_out_notify);
|
||||
cancel_delayed_work(&rt->headphone_notify.work);
|
||||
cancel_delayed_work(&rt->line_in_notify.work);
|
||||
cancel_delayed_work(&rt->line_out_notify.work);
|
||||
flush_scheduled_work();
|
||||
cancel_delayed_work_sync(&rt->headphone_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_in_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_out_notify.work);
|
||||
mutex_destroy(&rt->headphone_notify.mutex);
|
||||
mutex_destroy(&rt->line_in_notify.mutex);
|
||||
mutex_destroy(&rt->line_out_notify.mutex);
|
||||
|
|
|
|||
|
|
@ -107,10 +107,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
|
|||
|
||||
/* make sure no work is pending before freeing
|
||||
* all things */
|
||||
cancel_delayed_work(&rt->headphone_notify.work);
|
||||
cancel_delayed_work(&rt->line_in_notify.work);
|
||||
cancel_delayed_work(&rt->line_out_notify.work);
|
||||
flush_scheduled_work();
|
||||
cancel_delayed_work_sync(&rt->headphone_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_in_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_out_notify.work);
|
||||
|
||||
mutex_destroy(&rt->headphone_notify.mutex);
|
||||
mutex_destroy(&rt->line_in_notify.mutex);
|
||||
|
|
|
|||
Loading…
Reference in a new issue