summaryrefslogtreecommitdiff
path: root/sound/soc/atmel/snd-soc-afeb9260.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-25 14:17:24 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-25 14:17:24 +0300
commit2c54c1586c78775cfdfb071e68b27e14b668921f (patch)
treecf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/atmel/snd-soc-afeb9260.c
parentb26bb71f610f9b346203bff407e4278d98f9fe80 (diff)
parent8b6b30ab665d3bbb23180c39f6215e6f64516ed0 (diff)
downloadlinux-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.xz
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/atmel/snd-soc-afeb9260.c')
-rw-r--r--sound/soc/atmel/snd-soc-afeb9260.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c
index 1202f5e4894a..da2208e06b0d 100644
--- 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;
}