From 6435b3ce2a8723f2f8eb75257c48b3233c95af5b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 26 Dec 2011 20:50:02 +0800 Subject: [PATCH] --- yaml --- r: 284033 b: refs/heads/master c: 6e4f17cb2b7e8a5327ccc5a6a32442acd408c190 h: refs/heads/master i: 284031: cc028c4e80bcbad0b9f2c616fdca57cdad1c8cd9 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ad1836.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4a15f7cff696..76c81fdd6a4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80c2f9da4ecba2ba2ab65ddc058190b1be28d9e5 +refs/heads/master: 6e4f17cb2b7e8a5327ccc5a6a32442acd408c190 diff --git a/trunk/sound/soc/codecs/ad1836.c b/trunk/sound/soc/codecs/ad1836.c index 919322daf6dd..982d201c2e86 100644 --- a/trunk/sound/soc/codecs/ad1836.c +++ b/trunk/sound/soc/codecs/ad1836.c @@ -341,7 +341,8 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi) struct ad1836_priv *ad1836; int ret; - ad1836 = kzalloc(sizeof(struct ad1836_priv), GFP_KERNEL); + ad1836 = devm_kzalloc(&spi->dev, sizeof(struct ad1836_priv), + GFP_KERNEL); if (ad1836 == NULL) return -ENOMEM; @@ -351,17 +352,15 @@ static int __devinit ad1836_spi_probe(struct spi_device *spi) ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_ad1836, &ad183x_dais[ad1836->type], 1); - if (ret < 0) - kfree(ad1836); return ret; } static int __devexit ad1836_spi_remove(struct spi_device *spi) { snd_soc_unregister_codec(&spi->dev); - kfree(spi_get_drvdata(spi)); return 0; } + static const struct spi_device_id ad1836_ids[] = { { "ad1835", AD1835 }, { "ad1836", AD1836 },