X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fblock%2Fparide%2Fkbic.c;h=35999c415ee339784df83acbd13abb4bb111ec48;hb=d17a18dd92c91c784fcf7c785fa6bbf178fd0a6d;hp=a563281902765936c53613ce4613783761098fa4;hpb=f4330002d11f032559954cbff68a5cad95b6d27f;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/block/paride/kbic.c b/drivers/block/paride/kbic.c
index a563281..35999c4 100644
--- a/drivers/block/paride/kbic.c
+++ b/drivers/block/paride/kbic.c
@@ -283,7 +283,15 @@ static struct pi_protocol k971 = {
 
 static int __init kbic_init(void)
 {
-	return (paride_register(&k951)||paride_register(&k971))-1;
+	int rv;
+
+	rv = paride_register(&k951);
+	if (rv < 0)
+		return rv;
+	rv = paride_register(&k971);
+	if (rv < 0)
+		paride_unregister(&k951);
+	return rv;
 }
 
 static void __exit kbic_exit(void)