A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'origin' into secretlab/next-devicetree

Browse source 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <[email protected]>
This commit is contained in:
Grant Likely 2010-05-22 00:36:56 -06:00
commit cf9b59e9d3
6983 changed files with 473508 additions and 213620 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sound/aoa/core/gpio-pmf.c
View file

@ -116,12 +116,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
mutex_destroy(&rt->line_in_notify.mutex);
mutex_destroy(&rt->line_out_notify.mutex);
if (rt->headphone_notify.gpio_private)
kfree(rt->headphone_notify.gpio_private);
if (rt->line_in_notify.gpio_private)
kfree(rt->line_in_notify.gpio_private);
if (rt->line_out_notify.gpio_private)
kfree(rt->line_out_notify.gpio_private);
kfree(rt->headphone_notify.gpio_private);
kfree(rt->line_in_notify.gpio_private);
kfree(rt->line_out_notify.gpio_private);
}
static void pmf_handle_notify_irq(void *data)