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

Commit 57ddd5c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] ahci: fix NULL pointer dereference detected by Coverity
parents 7cafae52 ed071adc

drivers/scsi/ahci.c

+4 −10
Original line number Diff line number Diff line
@@ -742,24 +742,18 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
			struct ata_queued_cmd *qc;

			qc = ata_qc_from_tag(ap, ap->active_tag);

			if (!ahci_host_intr(ap, qc))

				if (ata_ratelimit()) {

					struct pci_dev *pdev =

						to_pci_dev(ap->host_set->dev);

					dev_printk(KERN_WARNING, &pdev->dev,

				if (ata_ratelimit())

					dev_printk(KERN_WARNING, host_set->dev,

					  "unhandled interrupt on port %u\n",

					  i);

				}



			VPRINTK("port %u\n", i);

		} else {

			VPRINTK("port %u (no irq)\n", i);

			if (ata_ratelimit()) {

				struct pci_dev *pdev =

					to_pci_dev(ap->host_set->dev);

				dev_printk(KERN_WARNING, &pdev->dev,

			if (ata_ratelimit())

				dev_printk(KERN_WARNING, host_set->dev,

					"interrupt on disabled port %u\n", i);

		}

		}



		irq_ack |= (1 << i);

	}