Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2...

[linux-2.6] / sound / isa / sscape.c

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 29bba8cc3ef30d658315d3cee560e0cfa87989eb..48e5552d34448bc562257a62613907469eedaac1 100644 (file)
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -1255,7 +1255,7 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp)
 }
 
 
-static int __init snd_sscape_probe(struct platform_device *pdev)
+static int __devinit snd_sscape_probe(struct platform_device *pdev)
 {
        int dev = pdev->id;
        struct snd_card *card;
@@ -1469,7 +1469,7 @@ static int __init sscape_init(void)
        if (ret < 0)
                return ret;
 #ifdef CONFIG_PNP
-       if (pnp_register_card_driver(&sscape_pnpc_driver) >= 0)
+       if (pnp_register_card_driver(&sscape_pnpc_driver) == 0)
                pnp_registered = 1;
 #endif
        return 0;