[PATCH] misc_register sx.c version 2

97dcccc6 · Chris Wilson · Linus Torvalds · ea3e48d7 · 97dcccc6
Commit 97dcccc6 authored Jan 05, 2003 by Chris Wilson Committed by Linus Torvalds Jan 05, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

drivers/char/sx.c drivers/char/sx.c +7 -5

No files found.
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2499,6 +2499,11 @@ static int __init sx_init(void)
 		sx_debug=-1;
 	}
+	if (misc_register(&sx_fw_device) < 0) {
+		printk(KERN_ERR "SX: Unable to register firmware loader driver.\n");
+		return -EIO;
+	}
 #ifdef CONFIG_PCI
 	if (pci_present ()) {
 #ifndef TWO_ZERO
@@ -2643,11 +2648,8 @@ static int __init sx_init(void)
 	}
 	if (found) {
 		printk (KERN_INFO "sx: total of %d boards detected.\n", found);
+	} else {
-		if (misc_register(&sx_fw_device) < 0) {
+		misc_deregister(&sx_fw_device);
-			printk(KERN_ERR "SX: Unable to register firmware loader driver.\n");
-			return -EIO;
-		}
 	}
 	func_exit();