diff options
Diffstat (limited to 'sound/soc/at32/playpaq_wm8510.c')
-rw-r--r-- | sound/soc/at32/playpaq_wm8510.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c index 3f326219f1ec..98a2d5826a85 100644 --- a/sound/soc/at32/playpaq_wm8510.c +++ b/sound/soc/at32/playpaq_wm8510.c | |||
@@ -377,6 +377,7 @@ static struct snd_soc_machine snd_soc_machine_playpaq = { | |||
377 | 377 | ||
378 | 378 | ||
379 | static struct wm8510_setup_data playpaq_wm8510_setup = { | 379 | static struct wm8510_setup_data playpaq_wm8510_setup = { |
380 | .i2c_bus = 0, | ||
380 | .i2c_address = 0x1a, | 381 | .i2c_address = 0x1a, |
381 | }; | 382 | }; |
382 | 383 | ||
@@ -405,7 +406,6 @@ static int __init playpaq_asoc_init(void) | |||
405 | ssc = ssc_request(0); | 406 | ssc = ssc_request(0); |
406 | if (IS_ERR(ssc)) { | 407 | if (IS_ERR(ssc)) { |
407 | ret = PTR_ERR(ssc); | 408 | ret = PTR_ERR(ssc); |
408 | ssc = NULL; | ||
409 | goto err_ssc; | 409 | goto err_ssc; |
410 | } | 410 | } |
411 | ssc_p->ssc = ssc; | 411 | ssc_p->ssc = ssc; |
@@ -476,10 +476,7 @@ err_pll0: | |||
476 | _gclk0 = NULL; | 476 | _gclk0 = NULL; |
477 | } | 477 | } |
478 | err_gclk0: | 478 | err_gclk0: |
479 | if (ssc != NULL) { | 479 | ssc_free(ssc); |
480 | ssc_free(ssc); | ||
481 | ssc = NULL; | ||
482 | } | ||
483 | err_ssc: | 480 | err_ssc: |
484 | return ret; | 481 | return ret; |
485 | } | 482 | } |