diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-18 08:19:47 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-20 15:14:26 -0400 |
commit | da343fc776e0bcb238b65d9d24610819b95d0ef4 (patch) | |
tree | 19de124ba0396f270edd3b056b5f175e22699659 /drivers/irqchip | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
irqchip: armada-370-xp: fix invalid cast of signed value into unsigned variable
The armada_370_xp_alloc_msi() function returns a signed int, which is
negative on error. However, we store the return value into an
irq_hw_number_t, which is unsigned. Therefore, we actually never test
if armada_370_xp_alloc_msi() returns an error or not, which may lead
us to use hwirq numbers of as 0xffffffe4 (when
armada_370_xp_alloc_msi() returns -ENOSPC).
This commit fixes that by storing the return value of
armada_370_xp_alloc_msi() in a signed variable.
Fixes: 31f614edb726fcc4d5aa0f2895fbdec9b04a3ca4 ('irqchip: armada-370-xp: implement MSI support')
Cc: <stable@vger.kernel.org> # v3.13+
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1397823593-1932-2-git-send-email-thomas.petazzoni@free-electrons.com
Tested-by: Neil Greatorex <neil@fatboyfat.co.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 41be897df8d5..3c8d89b62a21 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c | |||
@@ -132,8 +132,7 @@ static int armada_370_xp_setup_msi_irq(struct msi_chip *chip, | |||
132 | struct msi_desc *desc) | 132 | struct msi_desc *desc) |
133 | { | 133 | { |
134 | struct msi_msg msg; | 134 | struct msi_msg msg; |
135 | irq_hw_number_t hwirq; | 135 | int virq, hwirq; |
136 | int virq; | ||
137 | 136 | ||
138 | hwirq = armada_370_xp_alloc_msi(); | 137 | hwirq = armada_370_xp_alloc_msi(); |
139 | if (hwirq < 0) | 138 | if (hwirq < 0) |