Merge branch 'topic/misc' into for-linus

2010-03-10 09:01:30 +01:00
parent 7d39cf6224 89c0ac7cab
commit 0e49887703
1 changed files with 2 additions and 1 deletions
@@ -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];
 	}