diff options
Diffstat (limited to 'drivers/ide/ide-pm.c')
-rw-r--r-- | drivers/ide/ide-pm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index a8c53c98252d..51fe10ac02fa 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c | |||
@@ -44,15 +44,15 @@ static int ide_pm_execute_rq(struct request *rq) | |||
44 | { | 44 | { |
45 | struct request_queue *q = rq->q; | 45 | struct request_queue *q = rq->q; |
46 | 46 | ||
47 | spin_lock_irq(q->queue_lock); | 47 | spin_lock_irq(&q->queue_lock); |
48 | if (unlikely(blk_queue_dying(q))) { | 48 | if (unlikely(blk_queue_dying(q))) { |
49 | rq->rq_flags |= RQF_QUIET; | 49 | rq->rq_flags |= RQF_QUIET; |
50 | scsi_req(rq)->result = -ENXIO; | 50 | scsi_req(rq)->result = -ENXIO; |
51 | spin_unlock_irq(q->queue_lock); | 51 | spin_unlock_irq(&q->queue_lock); |
52 | blk_mq_end_request(rq, BLK_STS_OK); | 52 | blk_mq_end_request(rq, BLK_STS_OK); |
53 | return -ENXIO; | 53 | return -ENXIO; |
54 | } | 54 | } |
55 | spin_unlock_irq(q->queue_lock); | 55 | spin_unlock_irq(&q->queue_lock); |
56 | blk_execute_rq(q, NULL, rq, true); | 56 | blk_execute_rq(q, NULL, rq, true); |
57 | 57 | ||
58 | return scsi_req(rq)->result ? -EIO : 0; | 58 | return scsi_req(rq)->result ? -EIO : 0; |
@@ -214,12 +214,12 @@ void ide_complete_pm_rq(ide_drive_t *drive, struct request *rq) | |||
214 | printk("%s: completing PM request, %s\n", drive->name, | 214 | printk("%s: completing PM request, %s\n", drive->name, |
215 | (ide_req(rq)->type == ATA_PRIV_PM_SUSPEND) ? "suspend" : "resume"); | 215 | (ide_req(rq)->type == ATA_PRIV_PM_SUSPEND) ? "suspend" : "resume"); |
216 | #endif | 216 | #endif |
217 | spin_lock_irqsave(q->queue_lock, flags); | 217 | spin_lock_irqsave(&q->queue_lock, flags); |
218 | if (ide_req(rq)->type == ATA_PRIV_PM_SUSPEND) | 218 | if (ide_req(rq)->type == ATA_PRIV_PM_SUSPEND) |
219 | blk_mq_stop_hw_queues(q); | 219 | blk_mq_stop_hw_queues(q); |
220 | else | 220 | else |
221 | drive->dev_flags &= ~IDE_DFLAG_BLOCKED; | 221 | drive->dev_flags &= ~IDE_DFLAG_BLOCKED; |
222 | spin_unlock_irqrestore(q->queue_lock, flags); | 222 | spin_unlock_irqrestore(&q->queue_lock, flags); |
223 | 223 | ||
224 | drive->hwif->rq = NULL; | 224 | drive->hwif->rq = NULL; |
225 | 225 | ||