This is a note to let you know that I've just added the patch titled
net: moxa: fix an error code
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-moxa-fix-an-error-code.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1d3cd1773fddfdc9ffb0c2dec9a954c7a54bc207 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Date: Wed, 2 Mar 2016 13:11:10 +0300
Subject: net: moxa: fix an error code
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
commit 1d3cd1773fddfdc9ffb0c2dec9a954c7a54bc207 upstream.
We accidentally return IS_ERR(priv->base) which is 1 instead of
PTR_ERR(priv->base) which is the error code.
Fixes: 6c821bd9edc9 ('net: Add MOXA ART SoCs ethernet driver')
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/moxa/moxart_ether.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -460,9 +460,9 @@ static int moxart_mac_probe(struct platf
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ndev->base_addr = res->start;
priv->base = devm_ioremap_resource(p_dev, res);
- ret = IS_ERR(priv->base);
- if (ret) {
+ if (IS_ERR(priv->base)) {
dev_err(p_dev, "devm_ioremap_resource failed\n");
+ ret = PTR_ERR(priv->base);
goto init_fail;
}
Patches currently in stable-queue which might be from dan.carpenter@xxxxxxxxxx are
queue-4.4/net-moxa-fix-an-error-code.patch
queue-4.4/cx23885-uninitialized-variable-in-cx23885_av_work_handler.patch
queue-4.4/power-ipaq-micro-battery-freeing-the-wrong-variable.patch
queue-4.4/i40e-fix-an-uninitialized-variable-bug.patch
queue-4.4/mips-rm7000-double-locking-bug-in-rm7k_tc_disable.patch
queue-4.4/btrfs-clean-up-an-error-code-in-btrfs_init_space_info.patch
queue-4.4/xprtrdma-checking-for-null-instead-of-is_err.patch
queue-4.4/asoc-intel-pass-correct-parameter-in-sst_alloc_stream_mrfld.patch
queue-4.4/ath9k_htc-check-for-underflow-in-ath9k_htc_rx_msg.patch
queue-4.4/qlcnic-use-the-correct-ring-in-qlcnic_83xx_process_rcv_ring_diag.patch
queue-4.4/mips-octeon-off-by-one-in-octeon_irq_gpio_map.patch
queue-4.4/qede-uninitialized-variable-in-qede_start_xmit.patch
queue-4.4/mfd-lp8788-irq-uninitialized-variable-in-irq-handler.patch
queue-4.4/nfc-nci-memory-leak-in-nci_core_conn_create.patch
queue-4.4/ethernet-micrel-fix-some-error-codes.patch
queue-4.4/am437x-vpfe-fix-an-uninitialized-variable-bug.patch
queue-4.4/qlcnic-potential-null-dereference-in-qlcnic_83xx_get_minidump_template.patch
queue-4.4/bpf-mips-fix-off-by-one-in-ctx-offset-allocation.patch
queue-4.4/mdio-sun4i-oops-in-error-handling-in-probe.patch
queue-4.4/vfio-platform-reset-fix-a-warning-message-condition.patch
queue-4.4/x86-apic-uv-silence-a-shift-wrapping-warning.patch
