lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 29 Oct 2017 11:45:40 +0100 From: SF Markus Elfring <elfring@...rs.sourceforge.net> To: netdev@...r.kernel.org, linux-usb@...r.kernel.org, Bjørn Mork <bjorn@...k.no>, "David S. Miller" <davem@...emloft.net>, Greg Ungerer <gerg@...ux-m68k.org>, Liu Junliang <liujunliang_ljl@....com>, Philippe Reynes <tremyfr@...il.com> Cc: LKML <linux-kernel@...r.kernel.org>, kernel-janitors@...r.kernel.org Subject: [PATCH] sr9800: Use common error handling code in sr9800_phy_powerup() From: Markus Elfring <elfring@...rs.sourceforge.net> Date: Sun, 29 Oct 2017 11:33:14 +0100 Add a jump target so that a specific error message is stored only once at the end of this function implementation. Replace two calls of the function "netdev_err" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net> --- drivers/net/usb/sr9800.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index 9277a0f228df..79cfa72c68ba 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -700,10 +700,9 @@ static int sr9800_phy_powerup(struct usbnet *dev) /* set the embedded Ethernet PHY in power-up state */ ret = sr_sw_reset(dev, SR_SWRESET_IPRL); - if (ret < 0) { - netdev_err(dev->net, "Failed to reset PHY: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_reset_failure; + msleep(600); /* set the embedded Ethernet PHY in reset state */ @@ -716,12 +715,14 @@ static int sr9800_phy_powerup(struct usbnet *dev) /* set the embedded Ethernet PHY in power-up state */ ret = sr_sw_reset(dev, SR_SWRESET_IPRL); - if (ret < 0) { - netdev_err(dev->net, "Failed to reset PHY: %d\n", ret); - return ret; - } + if (ret < 0) + goto report_reset_failure; return 0; + +report_reset_failure: + netdev_err(dev->net, "Failed to reset PHY: %d\n", ret); + return ret; } static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf) -- 2.14.3
Powered by blists - more mailing lists