Merge branch 'topic/misc' into for-linus

1 files changed, 2 insertions, 1 deletions

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index becd90d7536d..4d2d0405bdc7 100644
--- 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];
         }