diff options
Diffstat (limited to 'sound/soc/samsung/s3c24xx-i2s.c')
-rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 63d8849d80bd..c08117e658db 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c | |||
@@ -383,10 +383,10 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) | |||
383 | return -ENXIO; | 383 | return -ENXIO; |
384 | 384 | ||
385 | s3c24xx_i2s.iis_clk = clk_get(dai->dev, "iis"); | 385 | s3c24xx_i2s.iis_clk = clk_get(dai->dev, "iis"); |
386 | if (s3c24xx_i2s.iis_clk == NULL) { | 386 | if (IS_ERR(s3c24xx_i2s.iis_clk)) { |
387 | pr_err("failed to get iis_clock\n"); | 387 | pr_err("failed to get iis_clock\n"); |
388 | iounmap(s3c24xx_i2s.regs); | 388 | iounmap(s3c24xx_i2s.regs); |
389 | return -ENODEV; | 389 | return PTR_ERR(s3c24xx_i2s.iis_clk); |
390 | } | 390 | } |
391 | clk_enable(s3c24xx_i2s.iis_clk); | 391 | clk_enable(s3c24xx_i2s.iis_clk); |
392 | 392 | ||
@@ -481,7 +481,7 @@ static __devexit int s3c24xx_iis_dev_remove(struct platform_device *pdev) | |||
481 | 481 | ||
482 | static struct platform_driver s3c24xx_iis_driver = { | 482 | static struct platform_driver s3c24xx_iis_driver = { |
483 | .probe = s3c24xx_iis_dev_probe, | 483 | .probe = s3c24xx_iis_dev_probe, |
484 | .remove = s3c24xx_iis_dev_remove, | 484 | .remove = __devexit_p(s3c24xx_iis_dev_remove), |
485 | .driver = { | 485 | .driver = { |
486 | .name = "s3c24xx-iis", | 486 | .name = "s3c24xx-iis", |
487 | .owner = THIS_MODULE, | 487 | .owner = THIS_MODULE, |