--- zzzz-none-000/linux-2.6.19.2/drivers/infiniband/hw/amso1100/c2.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/infiniband/hw/amso1100/c2.c	2007-01-11 07:38:19.000000000 +0000
@@ -1155,8 +1155,7 @@
 		goto bail10;
 	}
 
-	if (c2_register_device(c2dev))
-		goto bail10;
+	c2_register_device(c2dev);
 
 	return 0;