aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-05-22 02:36:56 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-05-22 02:36:56 -0400
commitcf9b59e9d3e008591d1f54830f570982bb307a0d (patch)
tree113478ce8fd8c832ba726ffdf59b82cb46356476 /sound/aoa
parent44504b2bebf8b5823c59484e73096a7d6574471d (diff)
parentf4b87dee923342505e1ddba8d34ce9de33e75050 (diff)
Merge remote branch 'origin' into secretlab/next-devicetree
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 <grant.likely@secretlab.ca>
Diffstat (limited to 'sound/aoa')
-rw-r--r--sound/aoa/core/gpio-pmf.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 6776d1c12b63..7e267c9379bc 100644
--- a/sound/aoa/core/gpio-pmf.c
+++ b/sound/aoa/core/gpio-pmf.c
@@ -116,12 +116,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
116 mutex_destroy(&rt->line_in_notify.mutex); 116 mutex_destroy(&rt->line_in_notify.mutex);
117 mutex_destroy(&rt->line_out_notify.mutex); 117 mutex_destroy(&rt->line_out_notify.mutex);
118 118
119 if (rt->headphone_notify.gpio_private) 119 kfree(rt->headphone_notify.gpio_private);
120 kfree(rt->headphone_notify.gpio_private); 120 kfree(rt->line_in_notify.gpio_private);
121 if (rt->line_in_notify.gpio_private) 121 kfree(rt->line_out_notify.gpio_private);
122 kfree(rt->line_in_notify.gpio_private);
123 if (rt->line_out_notify.gpio_private)
124 kfree(rt->line_out_notify.gpio_private);
125} 122}
126 123
127static void pmf_handle_notify_irq(void *data) 124static void pmf_handle_notify_irq(void *data)