From 2d9251df516cac96dd94a3e596e0d2a09a28a328 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 27 Mar 2006 01:17:17 -0800
Subject: [PATCH] --- yaml --- r: 24362 b: refs/heads/master c:
 38125956441c5cab28333414cee308d162507477 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/sound/isa/sscape.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f014cb957e1..e9bf2fc70648 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be54414d597b168d8c4eb2dafb8933ea15a7c148
+refs/heads/master: 38125956441c5cab28333414cee308d162507477
diff --git a/trunk/sound/isa/sscape.c b/trunk/sound/isa/sscape.c
index 29bba8cc3ef3..48e5552d3444 100644
--- a/trunk/sound/isa/sscape.c
+++ b/trunk/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;