[-next] gpio: thunderx: fix error return code in thunderx_gpio_probe()

Message ID 1515595033-83888-1-git-send-email-weiyongjun1@huawei.com
State New
Headers show
Series
  • [-next] gpio: thunderx: fix error return code in thunderx_gpio_probe()
Related show

Commit Message

weiyongjun (A) Jan. 10, 2018, 2:37 p.m.
Fix to return error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 5a2a30024d8c ("gpio: Add gpio driver support for ThunderX and OCTEON-TX")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/gpio/gpio-thunderx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Daney Jan. 10, 2018, 5:13 p.m. | #1
On 01/10/2018 06:37 AM, Wei Yongjun wrote:
> Fix to return error code -ENOMEM from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Fixes: 5a2a30024d8c ("gpio: Add gpio driver support for ThunderX and OCTEON-TX")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

This patch looks correct.  Thanks for finding and fixing this...

Acked-by: David Daney <david.daney@cavium.com>


> ---
>   drivers/gpio/gpio-thunderx.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
> index b5adb79..d16e9d4 100644
> --- a/drivers/gpio/gpio-thunderx.c
> +++ b/drivers/gpio/gpio-thunderx.c
> @@ -553,8 +553,10 @@ static int thunderx_gpio_probe(struct pci_dev *pdev,
>   	txgpio->irqd = irq_domain_create_hierarchy(irq_get_irq_data(txgpio->msix_entries[0].vector)->domain,
>   						   0, 0, of_node_to_fwnode(dev->of_node),
>   						   &thunderx_gpio_irqd_ops, txgpio);
> -	if (!txgpio->irqd)
> +	if (!txgpio->irqd) {
> +		err = -ENOMEM;
>   		goto out;
> +	}
>   
>   	/* Push on irq_data and the domain for each line. */
>   	for (i = 0; i < ngpio; i++) {
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij Jan. 11, 2018, 9:50 a.m. | #2
On Wed, Jan 10, 2018 at 3:37 PM, Wei Yongjun <weiyongjun1@huawei.com> wrote:

> Fix to return error code -ENOMEM from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 5a2a30024d8c ("gpio: Add gpio driver support for ThunderX and OCTEON-TX")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

Patch applied with David's ACK.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
index b5adb79..d16e9d4 100644
--- a/drivers/gpio/gpio-thunderx.c
+++ b/drivers/gpio/gpio-thunderx.c
@@ -553,8 +553,10 @@  static int thunderx_gpio_probe(struct pci_dev *pdev,
 	txgpio->irqd = irq_domain_create_hierarchy(irq_get_irq_data(txgpio->msix_entries[0].vector)->domain,
 						   0, 0, of_node_to_fwnode(dev->of_node),
 						   &thunderx_gpio_irqd_ops, txgpio);
-	if (!txgpio->irqd)
+	if (!txgpio->irqd) {
+		err = -ENOMEM;
 		goto out;
+	}
 
 	/* Push on irq_data and the domain for each line. */
 	for (i = 0; i < ngpio; i++) {