From: Christoph Hellwig Date: Thu, 20 Oct 2016 15:15:41 +0000 (+0200) Subject: ahci: fix nvec check X-Git-Tag: v4.9.8~846^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a478b097474cd9f2268ab1beaca74ff09e652b9b;p=platform%2Fkernel%2Flinux-rpi3.git ahci: fix nvec check commit 17a51f12 ("ahci: only try to use multi-MSI mode if there is more than 1 port") lead to a case where nvec isn't initialized before it's used. Fix this by moving the check into the n_ports conditional. Reported-and-reviewed-by Colin Ian King Signed-off-by: Christoph Hellwig Signed-off-by: Tejun Heo --- diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index ed311a0..60e42e2 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1436,14 +1436,14 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports, "ahci: MRSM is on, fallback to single MSI\n"); pci_free_irq_vectors(pdev); } - } - /* - * -ENOSPC indicated we don't have enough vectors. Don't bother trying - * a single vectors for any other error: - */ - if (nvec < 0 && nvec != -ENOSPC) - return nvec; + /* + * -ENOSPC indicated we don't have enough vectors. Don't bother + * trying a single vectors for any other error: + */ + if (nvec < 0 && nvec != -ENOSPC) + return nvec; + } /* * If the host is not capable of supporting per-port vectors, fall