Merge branch 'topic/misc' into for-linus

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index becd90d7536df11cbbd312b8ccd774bf75406646..4d2d0405bdc7bda05f0eb6a23a58d8d37e6da372 100644 (file)
--- 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];
        }