aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/88pm860x-codec.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/88pm860x-codec.c')
-rw-r--r--sound/soc/codecs/88pm860x-codec.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index e2bd3dd02c0e..8af04343cc1a 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1442,7 +1442,7 @@ static int pm860x_codec_probe(struct platform_device *pdev)
1442 res = platform_get_resource(pdev, IORESOURCE_IRQ, i); 1442 res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
1443 if (!res) { 1443 if (!res) {
1444 dev_err(&pdev->dev, "Failed to get IRQ resources\n"); 1444 dev_err(&pdev->dev, "Failed to get IRQ resources\n");
1445 goto out; 1445 return -EINVAL;
1446 } 1446 }
1447 pm860x->irq[i] = res->start + chip->irq_base; 1447 pm860x->irq[i] = res->start + chip->irq_base;
1448 strncpy(pm860x->name[i], res->name, MAX_NAME_LEN); 1448 strncpy(pm860x->name[i], res->name, MAX_NAME_LEN);
@@ -1452,19 +1452,14 @@ static int pm860x_codec_probe(struct platform_device *pdev)
1452 pm860x_dai, ARRAY_SIZE(pm860x_dai)); 1452 pm860x_dai, ARRAY_SIZE(pm860x_dai));
1453 if (ret) { 1453 if (ret) {
1454 dev_err(&pdev->dev, "Failed to register codec\n"); 1454 dev_err(&pdev->dev, "Failed to register codec\n");
1455 goto out; 1455 return -EINVAL;
1456 } 1456 }
1457 return ret; 1457 return ret;
1458
1459out:
1460 platform_set_drvdata(pdev, NULL);
1461 return -EINVAL;
1462} 1458}
1463 1459
1464static int pm860x_codec_remove(struct platform_device *pdev) 1460static int pm860x_codec_remove(struct platform_device *pdev)
1465{ 1461{
1466 snd_soc_unregister_codec(&pdev->dev); 1462 snd_soc_unregister_codec(&pdev->dev);
1467 platform_set_drvdata(pdev, NULL);
1468 return 0; 1463 return 0;
1469} 1464}
1470 1465