--- zzzz-none-000/linux-2.6.19.2/drivers/s390/crypto/ap_bus.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/s390/crypto/ap_bus.c	2007-01-11 07:38:19.000000000 +0000
@@ -739,16 +739,11 @@
 		dev = bus_find_device(&ap_bus_type, NULL,
 				      (void *)(unsigned long)qid,
 				      __ap_scan_bus);
-		rc = ap_query_queue(qid, &queue_depth, &device_type);
-		if (dev && rc) {
-			put_device(dev);
-			device_unregister(dev);
-			continue;
-		}
 		if (dev) {
 			put_device(dev);
 			continue;
 		}
+		rc = ap_query_queue(qid, &queue_depth, &device_type);
 		if (rc)
 			continue;
 		rc = ap_init_queue(qid);