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

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 29bba8cc3ef3..48e5552d3444 100644
--- 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;