Merge branch 'topic/misc' into for-linus

0e498877 · Takashi Iwai · 7d39cf62 · 89c0ac7c · 0e498877
Commit 0e498877 authored Mar 10, 2010 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sound/isa/opti9xx/opti92x-ad1848.c sound/isa/opti9xx/opti92x-ad1848.c +2 -1

No files found.
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -217,8 +217,9 @@ static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,
 	if (isapnp && chip->mc_base)
 		/* PnP resource gives the least 10 bits */
 		chip->mc_base |= 0xc00;
+	else
 #endif	/* CONFIG_PNP */
-	else {
+	{
 		chip->mc_base = 0xf8c;
 		chip->mc_base_size = opti9xx_mc_size[hardware];
 	}