Merge branch 'linus' into timers/nohz

[linux-2.6] / drivers / block / paride / kbic.c

diff --git a/drivers/block/paride/kbic.c b/drivers/block/paride/kbic.c
index a563281902765936c53613ce4613783761098fa4..35999c415ee339784df83acbd13abb4bb111ec48 100644 (file)
--- 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)