diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 17:42:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 17:42:02 +1100 |
| commit | 0a96a29915c35fdf9b3dca0bcfe4d03b38187098 (patch) | |
| tree | 04b0d6ac4232b75a0bc9aceb233ce7c25c0405fd /drivers/ata | |
| parent | 36ced305e72d6aaf3ce31b47f2159c6302e9013a (diff) | |
| parent | 140eefdb357f8ecc23bed902b12a9d0b8aa682cf (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-eh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 440ecc477cfa..6d8757008318 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -3016,7 +3016,7 @@ static inline void ata_eh_pull_park_action(struct ata_port *ap) * ourselves at the beginning of each pass over the loop. * * Additionally, all write accesses to &ap->park_req_pending - * through INIT_COMPLETION() (see below) or complete_all() + * through reinit_completion() (see below) or complete_all() * (see ata_scsi_park_store()) are protected by the host lock. * As a result we have that park_req_pending.done is zero on * exit from this function, i.e. when ATA_EH_PARK actions for @@ -3030,7 +3030,7 @@ static inline void ata_eh_pull_park_action(struct ata_port *ap) */ spin_lock_irqsave(ap->lock, flags); - INIT_COMPLETION(ap->park_req_pending); + reinit_completion(&ap->park_req_pending); ata_for_each_link(link, ap, EDGE) { ata_for_each_dev(dev, link, ALL) { struct ata_eh_info *ehi = &link->eh_info; |