From f681dcaa79d9b2f48d47d1b9b90daa0f1c118a94 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sun, 29 Oct 2006 03:43:19 +0900
Subject: [PATCH] --- yaml --- r: 40435 b: refs/heads/master c:
 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd h: refs/heads/master i:   40433:
 9a2e0190a677bcd1e713f043635ca52e56545fd2   40431:
 d400ce8aa1a4cae8d04b59d9c414755e859c49ad v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/char/watchdog/sc1200wdt.c |  9 +++++++--
 trunk/drivers/ieee1394/ohci1394.c       | 19 +++++--------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 802849daefba..2795baa0e6cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6c9f716ba91c1e065b75949f643383d1888bed5
+refs/heads/master: 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd
diff --git a/trunk/drivers/char/watchdog/sc1200wdt.c b/trunk/drivers/char/watchdog/sc1200wdt.c
index d8d0f28e0acf..e3239833e4b0 100644
--- a/trunk/drivers/char/watchdog/sc1200wdt.c
+++ b/trunk/drivers/char/watchdog/sc1200wdt.c
@@ -392,7 +392,7 @@ static int __init sc1200wdt_init(void)
 	if (io == -1) {
 		printk(KERN_ERR PFX "io parameter must be specified\n");
 		ret = -EINVAL;
-		goto out_clean;
+		goto out_pnp;
 	}
 
 #if defined CONFIG_PNP
@@ -405,7 +405,7 @@ static int __init sc1200wdt_init(void)
 	if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
 		printk(KERN_ERR PFX "Unable to register IO port %#x\n", io);
 		ret = -EBUSY;
-		goto out_clean;
+		goto out_pnp;
 	}
 
 	ret = sc1200wdt_probe();
@@ -435,6 +435,11 @@ static int __init sc1200wdt_init(void)
 out_io:
 	release_region(io, io_len);
 
+out_pnp:
+#if defined CONFIG_PNP
+	if (isapnp)
+		pnp_unregister_driver(&scl200wdt_pnp_driver);
+#endif
 	goto out_clean;
 }
 
diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c
index 6e8ea9110c46..dea13525df88 100644
--- a/trunk/drivers/ieee1394/ohci1394.c
+++ b/trunk/drivers/ieee1394/ohci1394.c
@@ -3552,21 +3552,12 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 {
 	int err;
 
-	printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
-	       OHCI1394_DRIVER_NAME);
-
 	err = pci_save_state(pdev);
-	if (err) {
-		printk(KERN_ERR "%s: pci_save_state failed with %d\n",
-		       OHCI1394_DRIVER_NAME, err);
-		return err;
-	}
+	if (err)
+		goto out;
 	err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
-#ifdef OHCI1394_DEBUG
 	if (err)
-		printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n",
-		       OHCI1394_DRIVER_NAME, err);
-#endif /* OHCI1394_DEBUG */
+		goto out;
 
 /* PowerMac suspend code comes last */
 #ifdef CONFIG_PPC_PMAC
@@ -3579,8 +3570,8 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 			pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
 	}
 #endif /* CONFIG_PPC_PMAC */
-
-	return 0;
+out:
+	return err;
 }
 #endif /* CONFIG_PM */