diff --git a/[refs] b/[refs]
index ca557360a2ce..bcb324dde59a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4921aff5b174349bc36551f142a5dbac782ea3f
+refs/heads/master: c596cc46ba1c5769866efe586daff3422bc31afe
diff --git a/trunk/drivers/scsi/gdth.c b/trunk/drivers/scsi/gdth.c
index e8010a702e73..3ac080ee6e2f 100644
--- a/trunk/drivers/scsi/gdth.c
+++ b/trunk/drivers/scsi/gdth.c
@@ -5213,6 +5213,10 @@ static int __init gdth_init(void)
 #endif /* CONFIG_PCI */
 
 	TRACE2(("gdth_detect() %d controller detected\n", gdth_ctr_count));
+
+	if (list_empty(&gdth_instances))
+		return -ENODEV;
+
 #ifdef GDTH_STATISTICS
 	TRACE2(("gdth_detect(): Initializing timer !\n"));
 	init_timer(&gdth_timer);