X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=sound%2Fsoc%2Fomap%2Fomap-twl4030.c;h=6a8d6b5f160debac623f79ad72b91dd5c77b1550;hb=2b64c5434d1303646388e748b7add69624a1cfee;hp=2a9324f794d8468172637ff07d28537a4a4cdd11;hpb=4ece92df296f472e49d26ee38ddbed4596458132;p=~andy%2Flinux

diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index 2a9324f794d..6a8d6b5f160 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -338,9 +338,9 @@ static int omap_twl4030_probe(struct platform_device *pdev)
 	}
 
 	snd_soc_card_set_drvdata(card, priv);
-	ret = snd_soc_register_card(card);
+	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret) {
-		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+		dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
 			ret);
 		return ret;
 	}
@@ -357,7 +357,6 @@ static int omap_twl4030_remove(struct platform_device *pdev)
 		snd_soc_jack_free_gpios(&priv->hs_jack,
 					ARRAY_SIZE(hs_jack_gpios),
 					hs_jack_gpios);
-	snd_soc_unregister_card(card);
 
 	return 0;
 }