summaryrefslogtreecommitdiffstats
path: root/sound/isa/opti9xx/miro.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-11-15 10:34:22 +0000
committerGrant Likely <grant.likely@secretlab.ca>2012-11-15 10:34:22 +0000
commitda63d20bfb12827dd7747a841ea27348af3abc0a (patch)
treeba275a74d068f91b453c08b9bacf8afe9577db9b /sound/isa/opti9xx/miro.c
parent55020c8056a83ef2181e4cddd39cb2b9f4b88c5a (diff)
parent77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff)
downloadblackbird-obmc-linux-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.gz
blackbird-obmc-linux-da63d20bfb12827dd7747a841ea27348af3abc0a.zip
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
Diffstat (limited to 'sound/isa/opti9xx/miro.c')
-rw-r--r--sound/isa/opti9xx/miro.c1
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)
error = snd_card_miro_aci_detect(card, miro);
if (error < 0) {
- snd_card_free(card);
snd_printk(KERN_ERR "unable to detect aci chip\n");
return -ENODEV;
}
OpenPOWER on IntegriCloud