---

yaml --- r: 21831 b: refs/heads/master c: 489ff4c h: refs/heads/master i: 21829: 8babb25 21827: 9977b39 21823: 453bb2d v: v3
git-mirror · Feb 10, 2006 · 3dbade6 · 3dbade6
1 parent 59b2874
commit 3dbade6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07b734702a96efbc260bf50c2ce57e34167f431b
+refs/heads/master: 489ff4c7d167be954f715128790bd80d3c888322
diff --git a/trunk/drivers/scsi/sata_sil24.c b/trunk/drivers/scsi/sata_sil24.c
@@ -485,10 +485,19 @@ static int sil24_softreset(struct ata_port *ap, int verbose,
 	return 0;
 }
 
+static int sil24_hardreset(struct ata_port *ap, int verbose,
+			   unsigned int *class)
+{
+	unsigned int dummy_class;
+
+	/* sil24 doesn't report device signature after hard reset */
+	return sata_std_hardreset(ap, verbose, &dummy_class);
+}
+
 static int sil24_probe_reset(struct ata_port *ap, unsigned int *classes)
 {
 	return ata_drive_probe_reset(ap, ata_std_probeinit,
-				     sil24_softreset, NULL,
+				     sil24_softreset, sil24_hardreset,
 				     ata_std_postreset, classes);
 }