Patch "net: 3com: typhoon: typhoon_init_one: make return values more specific" has been added to the 3.18-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: 3com: typhoon: typhoon_init_one: make return values more specific
to the 3.18-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-3com-typhoon-typhoon_init_one-make-return-values-more-specific.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Nov 28 10:58:31 CET 2017
From: Thomas Preisner <[email protected]>
Date: Fri, 30 Dec 2016 03:37:54 +0100
Subject: net: 3com: typhoon: typhoon_init_one: make return values more specific
From: Thomas Preisner <[email protected]>
[ Upstream commit 6b6bbb5922a4b1d4b58125a572da91010295fba3 ]
In some cases the return value of a failing function is not being used and the function typhoon_init_one() returns another negative error code instead.
--- drivers/net/ethernet/3com/typhoon.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/3com/typhoon.c +8 -8
@@ -2366,9 +2366,9 @@ typhoon_init_one(struct pci_dev *pdev, c* 4) Get the hardware address. * 5) Put the card to sleep. */ -if (typhoon_reset (ioaddr, WaitSleep) <0 ) { + err =typhoon_reset (ioaddr, WaitSleep); +if (err <0 ) { err_msg ="could not reset 3XP" ; - err = -EIO ; goto error_out_dma; }
@@ -2382,16 +2382,16 @@ typhoon_init_one(struct pci_dev *pdev, ctyphoon_init_interface (tp);typhoon_init_rings (tp); -if (typhoon_boot_3XP (tp,TYPHOON_STATUS_WAITING_FOR_HOST ) <0 ) { + err =typhoon_boot_3XP (tp,TYPHOON_STATUS_WAITING_FOR_HOST ); +if (err <0 ) { err_msg ="cannot boot 3XP sleep image" ; - err = -EIO ; goto error_out_reset; }INIT_COMMAND_WITH_RESPONSE (&xp_cmd,TYPHOON_CMD_READ_MAC_ADDRESS ); -if (typhoon_issue_command (tp,1 , &xp_cmd,1 , xp_resp) <0 ) { + err =typhoon_issue_command (tp,1 , &xp_cmd,1 , xp_resp); +if (err <0 ) { err_msg ="cannot read MAC address" ; - err = -EIO ; goto error_out_reset; }
@@ -2424,9 +2424,9 @@ typhoon_init_one(struct pci_dev *pdev, cif (xp_resp[0 ].numDesc !=0 ) tp->capabilities |=TYPHOON_WAKEUP_NEEDS_RESET ; -if (typhoon_sleep (tp, PCI_D3hot,0 ) <0 ) { + err =typhoon_sleep (tp, PCI_D3hot,0 ); +if (err <0 ) { err_msg ="cannot put adapter to sleep" ; - err = -EIO ; goto error_out_reset; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/net-3com-typhoon-typhoon_init_one-fix-incorrect-return-values.patch queue-3.18/net-3com-typhoon-typhoon_init_one-make-return-values-more-specific.patch