diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 02:39:08 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 02:39:08 -0500 |
| commit | fa3c9f3de2504bb09f8ad512f89837751a3eb741 (patch) | |
| tree | 656df0e4ea62d1c5a45bb7bfd1b4714f4936d63b /sound/soc/atmel/snd-soc-afeb9260.c | |
| parent | 193006f7e3b1abd42d7a3677b54fa2996461a842 (diff) | |
| parent | 55661fc1f105ed75852e937bf8ea408270eb0cca (diff) | |
Merge branch 'sh/cachetlb' into sh-fixes-for-linus
Diffstat (limited to 'sound/soc/atmel/snd-soc-afeb9260.c')
| -rw-r--r-- | sound/soc/atmel/snd-soc-afeb9260.c | 1 |
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 e3d283561c19..86e0f8586dc3 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) | |||
| 167 | 167 | ||
| 168 | return 0; | 168 | return 0; |
| 169 | err1: | 169 | err1: |
| 170 | platform_device_del(afeb9260_snd_device); | ||
| 171 | platform_device_put(afeb9260_snd_device); | 170 | platform_device_put(afeb9260_snd_device); |
| 172 | return err; | 171 | return err; |
| 173 | } | 172 | } |