From ca602c6324137aeaafeca047825fc765a6cc856a Mon Sep 17 00:00:00 2001 From: Elias Oltmanns Date: Mon, 3 Nov 2008 19:01:08 +0900 Subject: [PATCH] --- yaml --- r: 118399 b: refs/heads/master c: a464189de350b050aa8f334bd4cc53ed406e56dd h: refs/heads/master i: 118397: c38c5cbb9309ab69ccf8e3c82f34fb96ea983019 118395: b6eb4ea07e23d8e69e93ab813525014186c0577f 118391: 006f1e786e449a2e945f20ed965e510340d7a936 118383: 1758958c556386588650d8a31af5b8395284c73b 118367: 66f667a1d288c49d7b84dcfd5bde85a7cf086efc 118335: 85c382dca0c1b1acbdd129c84902ed10a3e16e81 118271: 60355098a39bb53d4505c47ce80321abeff812e5 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 31a19d9048e1..65d66fb14e4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c324283e6cdb79210cf7975c3e40d3ba3e672b2 +refs/heads/master: a464189de350b050aa8f334bd4cc53ed406e56dd diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index bbb30d882f05..3fa75eac135d 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -190,7 +190,7 @@ static ssize_t ata_scsi_park_show(struct device *device, struct ata_port *ap; struct ata_link *link; struct ata_device *dev; - unsigned long flags; + unsigned long flags, now; unsigned int uninitialized_var(msecs); int rc = 0; @@ -208,10 +208,11 @@ static ssize_t ata_scsi_park_show(struct device *device, } link = dev->link; + now = jiffies; if (ap->pflags & ATA_PFLAG_EH_IN_PROGRESS && link->eh_context.unloaded_mask & (1 << dev->devno) && - time_after(dev->unpark_deadline, jiffies)) - msecs = jiffies_to_msecs(dev->unpark_deadline - jiffies); + time_after(dev->unpark_deadline, now)) + msecs = jiffies_to_msecs(dev->unpark_deadline - now); else msecs = 0;