From 4e1773d38c0f9596d24bc07286fbe518022e179f Mon Sep 17 00:00:00 2001 From: d binderman Date: Fri, 19 Mar 2010 00:12:22 +0000 Subject: [PATCH] --- yaml --- r: 196595 b: refs/heads/master c: 6237cdac5dd26d5ba81acf5daa737c8645614410 h: refs/heads/master i: 196593: db03ebc4d1180d1d342fea7055813d20d40df359 196591: b98ab9e3a6e76578594af4492d1e9bde59aae867 v: v3 --- [refs] | 2 +- trunk/sound/aoa/core/gpio-pmf.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 00a459b6d2e8..045004b597e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 469d62be9263b92f2c3329540cbb1c076111f4f3 +refs/heads/master: 6237cdac5dd26d5ba81acf5daa737c8645614410 diff --git a/trunk/sound/aoa/core/gpio-pmf.c b/trunk/sound/aoa/core/gpio-pmf.c index 6776d1c12b63..7e267c9379bc 100644 --- a/trunk/sound/aoa/core/gpio-pmf.c +++ b/trunk/sound/aoa/core/gpio-pmf.c @@ -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)