ARC: Fix ICCM & DCCM runtime size checks
Subsystems (7)
Sasha Levin
maintainerPATCH 1/13 ARC: Fix ICCM & DCCM runtime size checks
From: Eugeniy Paltsev <[email protected]>
[ Upstream commit 43900edf67d7ef3ac8909854d75b8a1fba2d570c ]
As of today the ICCM and DCCM size checks are incorrectly using mismatched units (KiB checked against bytes). The CONFIG_ARC_DCCM_SZ and CONFIG_ARC_ICCM_SZ are in KiB, but the size calculated in runtime and stored in cpu->dccm.sz and cpu->iccm.sz is in bytes.
Fix that.
--- arch/arc/kernel/setup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arc/kernel/setup.c +3 -2
@@ -15,6 +15,7 @@#include <linux/clocksource.h> #include <linux/console.h> #include <linux/module.h> +#include <linux/sizes.h> #include <linux/cpu.h> #include <linux/of_fdt.h> #include <linux/of.h>
@@ -355,12 +356,12 @@ static void arc_chk_core_config(void)if ((unsigned int )__arc_dccm_base != cpu->dccm.base_addr)panic ("Linux built with incorrect DCCM Base address\n" ); -if (CONFIG_ARC_DCCM_SZ != cpu->dccm.sz) +if (CONFIG_ARC_DCCM_SZ *SZ_1K != cpu->dccm.sz)panic ("Linux built with incorrect DCCM Size\n" );#endif #ifdef CONFIG_ARC_HAS_ICCM -if (CONFIG_ARC_ICCM_SZ != cpu->iccm.sz) +if (CONFIG_ARC_ICCM_SZ *SZ_1K != cpu->iccm.sz)panic ("Linux built with incorrect ICCM Size\n" );#endif
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 2/13 ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT
From: Vineet Gupta <[email protected]>
[ Upstream commit 799587d5731db9dcdafaac4002463aa7d9cd6cf7 ]
Elide invalid configuration EZNPS + ARCv2, triggered by a make allyesconfig build.
Granted the root cause is in source code (asm/barrier.h) where we check for ARCv2 before PLAT_EZNPS, but it is better to avoid such combinations at onset rather then baking subtle nuances into code.
--- arch/arc/plat-eznps/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arc/plat-eznps/Kconfig +1 -0
@@ -6,6 +6,7 @@ menuconfig ARC_PLAT_EZNPS bool "\"EZchip\" ARC dev platform" + depends on ISA_ARCOMPACT select CPU_BIG_ENDIAN select CLKSRC_NPS if !PHYS_ADDR_T_64BIT select EZNPS_GIC
Signature · 7 lines
2.25.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Sasha Levin
maintainerPATCH 3/13 i2c: altera: Fix race between xfer_msg and isr thread
In reply to Sasha LevinFrom: Atsushi Nemoto <[email protected]>
[ Upstream commit 5d4c7977499a736f3f80826bdc9744344ad55589 ]
Use a mutex to protect access to idev->msg_len, idev->buf, etc. which are modified by both altr_i2c_xfer_msg() and altr_i2c_isr().
This is the minimal fix for easy backporting. A cleanup to remove the spinlock will be added later.
--- drivers/i2c/busses/i2c-altera.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-altera.c +9 -1
@@ -81,6 +81,7 @@* @isr_mask: cached copy of local ISR enables. * @isr_status: cached copy of local ISR status. * @lock: spinlock for IRQ synchronization. +* @isr_mutex: mutex for IRQ thread. */ struct altr_i2c_dev {void __iomem *base;
@@ -97,6 +98,7 @@ struct altr_i2c_dev {u32 isr_mask;u32 isr_status;spinlock_t lock;/* IRQ synchronization */ +struct mutex isr_mutex; }; static void
@@ -256,10 +258,11 @@ static irqreturn_t altr_i2c_isr(int irq, void *_dev)struct altr_i2c_dev *idev = _dev;u32 status = idev->isr_status; +mutex_lock (&idev->isr_mutex);if (!idev->msg) {dev_warn (idev->dev,"unexpected interrupt\n" );altr_i2c_int_clear (idev,ALTR_I2C_ALL_IRQ ); -return IRQ_HANDLED ; + goto out; } read = (idev->msg->flags &I2C_M_RD ) !=0 ;
@@ -312,6 +315,8 @@ static irqreturn_t altr_i2c_isr(int irq, void *_dev)complete (&idev->msg_complete);dev_dbg (idev->dev,"Message Complete\n" ); } +out: +mutex_unlock (&idev->isr_mutex);return IRQ_HANDLED ; }
@@ -323,6 +328,7 @@ static int altr_i2c_xfer_msg(struct altr_i2c_dev *idev, struct i2c_msg *msg)u32 value;u8 addr =i2c_8bit_addr_from_msg (msg); +mutex_lock (&idev->isr_mutex); idev->msg = msg; idev->msg_len = msg->len; idev->buf = msg->buf;
@@ -347,6 +353,7 @@ static int altr_i2c_xfer_msg(struct altr_i2c_dev *idev, struct i2c_msg *msg)altr_i2c_int_enable (idev, imask, true);altr_i2c_fill_tx_fifo (idev); } +mutex_unlock (&idev->isr_mutex); time_left =wait_for_completion_timeout (&idev->msg_complete,ALTR_I2C_XFER_TIMEOUT );
@@ -420,6 +427,7 @@ static int altr_i2c_probe(struct platform_device *pdev) idev->dev = &pdev->dev;init_completion (&idev->msg_complete);spin_lock_init (&idev->lock); +mutex_init (&idev->isr_mutex); ret =device_property_read_u32 (idev->dev,"fifo-size" , &idev->fifo_size);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 4/13 net sched: fix reporting the first-time use timestamp
In reply to Sasha LevinFrom: Roman Mashak <[email protected]>
[ Upstream commit b15e62631c5f19fea9895f7632dae9c1b27fe0cd ]
When a new action is installed, firstuse field of 'tcf_t' is explicitly set to 0. Value of zero means "new action, not yet used"; as a packet hits the action, 'firstuse' is stamped with the current jiffies value.
tcf_tm_dump() should return 0 for firstuse if action has not yet been hit.
--- include/net/act_api.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/net/act_api.h +2 -1
@@ -69,7 +69,8 @@ static inline void tcf_tm_dump(struct tcf_t *dtm, const struct tcf_t *stm) { dtm->install =jiffies_to_clock_t (jiffies - stm->install); dtm->lastuse =jiffies_to_clock_t (jiffies - stm->lastuse); - dtm->firstuse =jiffies_to_clock_t (jiffies - stm->firstuse); + dtm->firstuse = stm->firstuse ? +jiffies_to_clock_t (jiffies - stm->firstuse) :0 ; dtm->expires =jiffies_to_clock_t (stm->expires); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 5/13 x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit d7110a26e5905ec2fe3fc88bc6a538901accb72b ]
When building with Clang + -Wtautological-compare and CONFIG_CPUMASK_OFFSTACK unset:
arch/x86/mm/mmio-mod.c:375:6: warning: comparison of array 'downed_cpus' equal to a null pointer is always false [-Wtautological-pointer-compare]
if (downed_cpus == NULL &&
^~~~~~~~~~~ ~~~~
arch/x86/mm/mmio-mod.c:405:6: warning: comparison of array 'downed_cpus'
equal to a null pointer is always false [-Wtautological-pointer-compare]
if (downed_cpus == NULL || cpumask_weight(downed_cpus) == 0)
^~~~~~~~~~~ ~~~~2 warnings generated.
Commit
f7e30f01a9e2 ("cpumask: Add helper cpumask_available()")
added cpumask_available() to fix warnings of this nature. Use that here so that clang does not warn regardless of CONFIG_CPUMASK_OFFSTACK's value.
--- arch/x86/mm/mmio-mod.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/mmio-mod.c +2 -2
@@ -385,7 +385,7 @@ static void enter_uniprocessor(void)int cpu;int err; -if (downed_cpus ==NULL && +if (!cpumask_available (downed_cpus) && !alloc_cpumask_var (&downed_cpus,GFP_KERNEL )) {pr_notice ("Failed to allocate mask\n" ); goto out;
@@ -415,7 +415,7 @@ static void leave_uniprocessor(void)int cpu;int err; -if (downed_cpus ==NULL ||cpumask_weight (downed_cpus) ==0 ) +if (!cpumask_available (downed_cpus) ||cpumask_weight (downed_cpus) ==0 )return ;pr_notice ("Re-enabling CPUs...\n" );for_each_cpu (cpu, downed_cpus) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 6/13 net: bmac: Fix read of MAC address from ROM
In reply to Sasha LevinFrom: Jeremy Kerr <[email protected]>
[ Upstream commit ef01cee2ee1b369c57a936166483d40942bcc3e3 ]
In bmac_get_station_address, We're reading two bytes at a time from ROM, but we do that six times, resulting in 12 bytes of read & writes. This means we will write off the end of the six-byte destination buffer.
This change fixes the for-loop to only read/write six bytes.
Based on a proposed fix from Finn Thain <[email protected]>.
--- drivers/net/ethernet/apple/bmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/apple/bmac.c +1 -1
@@ -1187,7 +1187,7 @@ bmac_get_station_address(struct net_device *dev, unsigned char *ea)int i;unsigned short data; -for (i =0 ; i <6 ; i++) +for (i =0 ; i <3 ; i++) {reset_and_select_srom (dev); data =read_srom (dev, i + EnetAddressOffset/2 , SROMAddressBits);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 7/13 r8152: support additional Microsoft Surface Ethernet Adapter variant
In reply to Sasha LevinFrom: Marc Payne <[email protected]>
[ Upstream commit c27a204383616efba5a4194075e90819961ff66a ]
Device id 0927 is the RTL8153B-based component of the 'Surface USB-C to Ethernet and USB Adapter' and may be used as a component of other devices in future. Tested and working with the r8152 driver.
Update the cdc_ether blacklist due to the RTL8153 'network jam on suspend' issue which this device will cause (personally confirmed).
--- drivers/net/usb/cdc_ether.c | 11 +++++++++-- drivers/net/usb/r8152.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/usb/cdc_ether.c +9 -2
@@ -821,14 +821,21 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, -/* Microsoft Surface 3 dock (based on Realtek RTL8153) */ +/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153) */ {USB_DEVICE_AND_INTERFACE_INFO (MICROSOFT_VENDOR_ID ,0x07c6 ,USB_CLASS_COMM , USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info =0 , }, - /* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */ +/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153B) */ +{ +USB_DEVICE_AND_INTERFACE_INFO (MICROSOFT_VENDOR_ID ,0x0927 ,USB_CLASS_COMM , +USB_CDC_SUBCLASS_ETHERNET ,USB_CDC_PROTO_NONE ), + .driver_info = 0, +}, + +/* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */ {USB_DEVICE_AND_INTERFACE_INFO (TPLINK_VENDOR_ID ,0x0601 ,USB_CLASS_COMM , USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
drivers/net/usb/r8152.c +1 -0
@@ -5329,6 +5329,7 @@ static const struct usb_device_id rtl8152_table[] = { {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)}, {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)}, + {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)}, {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 8/13 net/ethernet/freescale: rework quiesce/activate for ucc_geth
In reply to Sasha LevinFrom: Valentin Longchamp <[email protected]>
[ Upstream commit 79dde73cf9bcf1dd317a2667f78b758e9fe139ed ]
ugeth_quiesce/activate are used to halt the controller when there is a link change that requires to reconfigure the mac.
The previous implementation called netif_device_detach(). This however causes the initial activation of the netdevice to fail precisely because it's detached. For details, see [1].
A possible workaround was the revert of commit
net: linkwatch: add check for netdevice being present to linkwatch_do_dev However, the check introduced in the above commit is correct and shall be kept.
The netif_device_detach() is thus replaced with netif_tx_stop_all_queues() that prevents any tranmission. This allows to perform mac config change required by the link change, without detaching the corresponding netdevice and thus not preventing its initial activation.
[1] https://lists.openwall.net/netdev/2020/01/08/201
--- drivers/net/ethernet/freescale/ucc_geth.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/freescale/ucc_geth.c +7 -6
@@ -45,6 +45,7 @@#include <soc/fsl/qe/ucc.h> #include <soc/fsl/qe/ucc_fast.h> #include <asm/machdep.h> +#include <net/sch_generic.h> #include "ucc_geth.h"
@@ -1551,11 +1552,8 @@ static int ugeth_disable(struct ucc_geth_private *ugeth, enum comm_dir mode)static void ugeth_quiesce (struct ucc_geth_private *ugeth) { -/* Prevent any further xmits, plus detach the device. */ -netif_device_detach (ugeth->ndev); - -/* Wait for any current xmits to finish. */ -netif_tx_disable (ugeth->ndev); +/* Prevent any further xmits */ +netif_tx_stop_all_queues (ugeth->ndev);/* Disable the interrupt to avoid NAPI rescheduling. */ disable_irq (ugeth->ug_info->uf_info.irq);
@@ -1568,7 +1566,10 @@ static void ugeth_activate(struct ucc_geth_private *ugeth) {napi_enable (&ugeth->napi);enable_irq (ugeth->ug_info->uf_info.irq); -netif_device_attach (ugeth->ndev); + +/* allow to xmit again */ +netif_tx_wake_all_queues (ugeth->ndev); +__netdev_watchdog_up (ugeth->ndev); }/* Called every time the controller might need to be made
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 9/13 net: ethernet: stmmac: Enable interface clocks on probe for IPQ806x
In reply to Sasha LevinFrom: Jonathan McDowell <[email protected]>
[ Upstream commit a96ac8a0045e3cbe3e5af6d1b3c78c6c2065dec5 ]
The ipq806x_gmac_probe() function enables the PTP clock but not the appropriate interface clocks. This means that if the bootloader hasn't done so attempting to bring up the interface will fail with an error like:
[ 59.028131] ipq806x-gmac-dwmac 37600000.ethernet: Failed to reset the dma [ 59.028196] ipq806x-gmac-dwmac 37600000.ethernet eth1: stmmac_hw_setup: DMA engine initialization failed [ 59.034056] ipq806x-gmac-dwmac 37600000.ethernet eth1: stmmac_open: Hw setup failed
This patch, a slightly cleaned up version of one posted by Sergey Sergeev in:
https://forum.openwrt.org/t/support-for-mikrotik-rb3011uias-rm/4064/257
correctly enables the clock; we have already configured the source just before this.
Tested on a MikroTik RB3011.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +13 -0
@@ -330,6 +330,19 @@ static int ipq806x_gmac_probe(struct platform_device *pdev)/* Enable PTP clock */ regmap_read (gmac->nss_common,NSS_COMMON_CLK_GATE , &val); val |=NSS_COMMON_CLK_GATE_PTP_EN (gmac->id); +switch (gmac->phy_mode) { +case PHY_INTERFACE_MODE_RGMII : + val |=NSS_COMMON_CLK_GATE_RGMII_RX_EN (gmac->id) | +NSS_COMMON_CLK_GATE_RGMII_TX_EN (gmac->id); +break ; +case PHY_INTERFACE_MODE_SGMII : + val |=NSS_COMMON_CLK_GATE_GMII_RX_EN (gmac->id) | +NSS_COMMON_CLK_GATE_GMII_TX_EN (gmac->id); +break ; +default : +/* We don't get here; the switch above will have errored out */ +unreachable (); + }regmap_write (gmac->nss_common,NSS_COMMON_CLK_GATE , val);if (gmac->phy_mode ==PHY_INTERFACE_MODE_SGMII ) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 10/13 net: sun: fix missing release regions in cas_init_one().
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit 5a730153984dd13f82ffae93d7170d76eba204e9 ]
In cas_init_one(), "pdev" is requested by "pci_request_regions", but it was not released after a call of the function “pci_write_config_byte” failed. Thus replace the jump target “err_write_cacheline” by "err_out_free_res".
--- drivers/net/ethernet/sun/cassini.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/sun/cassini.c +1 -2
@@ -4983,7 +4983,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) cas_cacheline_size)) {dev_err (&pdev->dev,"Could not set PCI cache " "line size\n" ); - goto err_write_cacheline; + goto err_out_free_res; } }#endif
@@ -5158,7 +5158,6 @@ err_out_iounmap: err_out_free_res:pci_release_regions (pdev); -err_write_cacheline:/* Try to restore it in case the error occurred after we * set it. */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 11/13 net/mlx5: Add command entry handling completion
In reply to Sasha LevinFrom: Moshe Shemesh <[email protected]>
[ Upstream commit 17d00e839d3b592da9659c1977d45f85b77f986a ]
When FW response to commands is very slow and all command entries in use are waiting for completion we can have a race where commands can get timeout before they get out of the queue and handled. Timeout completion on uninitialized command will cause releasing command's buffers before accessing it for initialization and then we will get NULL pointer exception while trying access it. It may also cause releasing buffers of another command since we may have timeout completion before even allocating entry index for this command.
Add entry handling completion to avoid this race.
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 ++++++++++++++ include/linux/mlx5/driver.h | 1 + 2 files changed, 15 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +14 -0
@@ -804,6 +804,7 @@ static void cmd_work_handler(struct work_struct *work)int alloc_ret;int cmd_mode; +complete (&ent->handling); sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;down (sem);if (!ent->page_queue) {
@@ -922,6 +923,11 @@ static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)struct mlx5_cmd *cmd = &dev->cmd;int err; +if (!wait_for_completion_timeout (&ent->handling, timeout) && +cancel_work_sync (&ent->work)) { + ent->ret = -ECANCELED ; + goto out_err; + }if (cmd->mode ==CMD_MODE_POLLING || ent->polling) {wait_for_completion (&ent->done); }else if (!wait_for_completion_timeout (&ent->done, timeout)) {
@@ -929,12 +935,17 @@ static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)mlx5_cmd_comp_handler (dev,1UL << ent->idx, true); } +out_err: err = ent->ret;if (err == -ETIMEDOUT ) {mlx5_core_warn (dev,"%s(0x%x) timeout. Will cause a leak of a command resource\n" ,mlx5_command_str (msg_to_opcode (ent->in)),msg_to_opcode (ent->in)); + }else if (err == -ECANCELED ) { +mlx5_core_warn (dev,"%s(0x%x) canceled on out of queue timeout.\n" , +mlx5_command_str (msg_to_opcode (ent->in)), +msg_to_opcode (ent->in)); }mlx5_core_dbg (dev,"err %d, delivery status %s(%d)\n" , err,deliv_status_to_str (ent->status), ent->status);
@@ -970,6 +981,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, ent->token = token; ent->polling = force_polling; +init_completion (&ent->handling);if (!callback)init_completion (&ent->done);
@@ -989,6 +1001,8 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, err =wait_func (dev, ent);if (err == -ETIMEDOUT ) goto out; +if (err == -ECANCELED ) + goto out_free; ds = ent->ts2 - ent->ts1; op =MLX5_GET (mbox_in, in->first.data, opcode);
include/linux/mlx5/driver.h +1 -0
@@ -841,6 +841,7 @@ struct mlx5_cmd_work_ent {struct delayed_work cb_timeout_work;void *context;int idx; +struct completion handling;struct completion done;struct mlx5_cmd *cmd;struct work_struct work;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 12/13 net/mlx4_core: fix a memory leak bug.
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit febfd9d3c7f74063e8e630b15413ca91b567f963 ]
In function mlx4_opreq_action(), pointer "mailbox" is not released, when mlx4_cmd_box() return and error, causing a memory leak bug. Fix this issue by going to "out" label, mlx4_free_cmd_mailbox() can free this pointer.
--- drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/fw.c +1 -1
@@ -2715,7 +2715,7 @@ void mlx4_opreq_action(struct work_struct *work)if (err) {mlx4_err (dev,"Failed to retrieve required operation: %d\n" , err); -return ; + goto out; }MLX4_GET (modifier, outbox,GET_OP_REQ_MODIFIER_OFFSET );MLX4_GET (token, outbox,GET_OP_REQ_TOKEN_OFFSET );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 13/13 net: smsc911x: Fix runtime PM imbalance on error
In reply to Sasha LevinFrom: Dinghao Liu <[email protected]>
[ Upstream commit 539d39ad0c61b35f69565a037d7586deaf6d6166 ]
Remove runtime PM usage counter decrement when the increment function has not been called to keep the counter balanced.
--- drivers/net/ethernet/smsc/smsc911x.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/smsc/smsc911x.c +5 -4
@@ -2515,20 +2515,20 @@ static int smsc911x_drv_probe(struct platform_device *pdev) retval =smsc911x_init (dev);if (retval <0 ) - goto out_disable_resources; + goto out_init_fail;netif_carrier_off (dev); retval =smsc911x_mii_init (pdev, dev);if (retval) {SMSC_WARN (pdata, probe,"Error %i initialising mii" , retval); - goto out_disable_resources; + goto out_init_fail; } retval =register_netdev (dev);if (retval) {SMSC_WARN (pdata, probe,"Error %i registering device" , retval); - goto out_disable_resources; + goto out_init_fail; }else {SMSC_TRACE (pdata, probe,"Network interface: \"%s\"" , dev->name);
@@ -2569,9 +2569,10 @@ static int smsc911x_drv_probe(struct platform_device *pdev)return 0 ; -out_disable_resources: +out_init_fail:pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev); +out_disable_resources: (void )smsc911x_disable_resources (pdev); out_enable_resources_fail:smsc911x_free_resources (pdev);
Signature · 1 line
2.25.1