From c9acff5404c68ba93d9e12bfe11d8090c0108bf4 Mon Sep 17 00:00:00 2001 From: Julien Brunel Date: Fri, 26 Sep 2008 15:23:46 +0200 Subject: [PATCH] --- yaml --- r: 111067 b: refs/heads/master c: 71dc525c5d480397ac7343a0a2808f8a23705d42 h: refs/heads/master i: 111065: 9df61432b6cebf3010ca0990e29783f65212355d 111063: c08922eb93169965598ac84cd41b2e94ddaf3d85 v: v3 --- [refs] | 2 +- trunk/sound/soc/at32/playpaq_wm8510.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5158eda99162..a2ad2da1145b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a9e2359f484402c620f9a3748037fea65fa5af4 +refs/heads/master: 71dc525c5d480397ac7343a0a2808f8a23705d42 diff --git a/trunk/sound/soc/at32/playpaq_wm8510.c b/trunk/sound/soc/at32/playpaq_wm8510.c index 7e6560ba7510..98a2d5826a85 100644 --- a/trunk/sound/soc/at32/playpaq_wm8510.c +++ b/trunk/sound/soc/at32/playpaq_wm8510.c @@ -406,7 +406,6 @@ static int __init playpaq_asoc_init(void) ssc = ssc_request(0); if (IS_ERR(ssc)) { ret = PTR_ERR(ssc); - ssc = NULL; goto err_ssc; } ssc_p->ssc = ssc; @@ -477,10 +476,7 @@ static int __init playpaq_asoc_init(void) _gclk0 = NULL; } err_gclk0: - if (ssc != NULL) { - ssc_free(ssc); - ssc = NULL; - } + ssc_free(ssc); err_ssc: return ret; }