Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e838b72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] sata_mv: grab host lock inside eng_timeout
parents 289a1e99 2f9719b6

drivers/scsi/sata_mv.c

+3 −0
Original line number Diff line number Diff line
@@ -2035,6 +2035,7 @@ static void mv_phy_reset(struct ata_port *ap) 
static void mv_eng_timeout(struct ata_port *ap)

{

	struct ata_queued_cmd *qc;

	unsigned long flags;



	printk(KERN_ERR "ata%u: Entering mv_eng_timeout\n",ap->id);

	DPRINTK("All regs @ start of eng_timeout\n");
@@ -2046,8 +2047,10 @@ static void mv_eng_timeout(struct ata_port *ap) 
	       ap->host_set->mmio_base, ap, qc, qc->scsicmd,

	       &qc->scsicmd->cmnd);



	spin_lock_irqsave(&ap->host_set->lock, flags);

	mv_err_intr(ap, 0);

	mv_stop_and_reset(ap);

	spin_unlock_irqrestore(&ap->host_set->lock, flags);



	WARN_ON(!(qc->flags & ATA_QCFLAG_ACTIVE));

	if (qc->flags & ATA_QCFLAG_ACTIVE) {