On 20/10/16 16:15, Christoph Hellwig wrote:
> 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-by Colin Ian King <colin.king@xxxxxxxxxxxxx>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/ata/ahci.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> 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
>
That looks good to me. Thanks Christoph
Acked-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
