summaryrefslogtreecommitdiffstats
path: root/sound/atmel/ac97c.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-21 12:51:35 +0200
committerTakashi Iwai <tiwai@suse.de>2012-05-21 12:51:35 +0200
commit382e6a859e6622de0aa62c01976ae8ebd90e986d (patch)
tree2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/atmel/ac97c.c
parent6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff)
parent97f8d3b6503082416898f893a442a78f8819c42a (diff)
downloadtalos-op-linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.tar.gz
talos-op-linux-382e6a859e6622de0aa62c01976ae8ebd90e986d.zip
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/atmel/ac97c.c')
-rw-r--r--sound/atmel/ac97c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 115313ef54d6..f5ded640b395 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -991,6 +991,8 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
gpio_direction_output(pdata->reset_pin, 1);
chip->reset_pin = pdata->reset_pin;
}
+ } else {
+ chip->reset_pin = -EINVAL;
}
snd_card_set_dev(card, &pdev->dev);
OpenPOWER on IntegriCloud