diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-30 06:08:25 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-30 06:08:25 -0400 |
| commit | a5d00dc3a4b65ed38249f3225e453944c633747b (patch) | |
| tree | 6249ca5a5f13059f42890525a9ea7133778f3891 /sound/isa | |
| parent | 1a8506d4402b6e96c2ed778dc7ccbb48d1e02fce (diff) | |
| parent | 0914f7961babbf28aaa2f19b453951fb4841c03f (diff) | |
Merge branch 'for-linus' into for-next
... for migrating the core changes for USB-audio disconnection fixes
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/opti9xx/miro.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 3d1afb612b35..4a7ff4e8985b 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
| @@ -1286,7 +1286,6 @@ static int __devinit snd_miro_probe(struct snd_card *card) | |||
| 1286 | 1286 | ||
| 1287 | error = snd_card_miro_aci_detect(card, miro); | 1287 | error = snd_card_miro_aci_detect(card, miro); |
| 1288 | if (error < 0) { | 1288 | if (error < 0) { |
| 1289 | snd_card_free(card); | ||
| 1290 | snd_printk(KERN_ERR "unable to detect aci chip\n"); | 1289 | snd_printk(KERN_ERR "unable to detect aci chip\n"); |
| 1291 | return -ENODEV; | 1290 | return -ENODEV; |
| 1292 | } | 1291 | } |