From 3dbade61215c2e9990984d011d38f34d5a2ce61e Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 10 Feb 2006 23:58:48 +0900 Subject: [PATCH] --- yaml --- r: 21831 b: refs/heads/master c: 489ff4c7d167be954f715128790bd80d3c888322 h: refs/heads/master i: 21829: 8babb259ffd3536236e44ebfd82e4a8b448736f9 21827: 9977b39a88b94d028b01d997ddf5e9c12926d9a8 21823: 453bb2d17996104786cd1e1346dc837f97d197f0 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sata_sil24.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e51f14f6f6d1..ad9c8e05c76f 100644 --- 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 index ccac05a5eb6d..228a7fabffff 100644 --- 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); }