Merge branch 'for-2.6.37' into for-2.6.38

[firefly-linux-kernel-4.4.55.git] / sound / soc / atmel / snd-soc-afeb9260.c

diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c
index 1202f5e4894aacc74782d9459cabd2d6517aedb8..da2208e06b0d632299b61f1cc01a03fcf61bc911 100644 (file)
--- a/sound/soc/atmel/snd-soc-afeb9260.c
+++ b/sound/soc/atmel/snd-soc-afeb9260.c
@@ -167,7 +167,6 @@ static int __init afeb9260_soc_init(void)
 
        return 0;
 err1:
-       platform_device_del(afeb9260_snd_device);
        platform_device_put(afeb9260_snd_device);
        return err;
 }