On 08/13/2015 11:26 AM, nick wrote:

On 2015-07-30 03:44 PM, Murali Karicheri wrote:

quoted

On 07/30/2015 02:27 PM, Nicholas Krause wrote:

quoted

This fixes error checking in the function gbe_open by checking if
the function netcp_register_txhook has failed by returning a error
code and if so jump to the goto label fail for handling internal
failures in this function.

Signed-off-by: Nicholas Krause <redacted>
---
   drivers/net/ethernet/ti/netcp_ethss.c | 6 ++++--
   1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index 9b7e0a3..e81e66b 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c

@@ -2257,8 +2257,10 @@ static int gbe_open(void *intf_priv, struct net_device *ndev)
       if (ret)
           goto fail;

-    netcp_register_txhook(netcp, GBE_TXHOOK_ORDER, gbe_tx_hook,
-                  gbe_intf);
+    ret = netcp_register_txhook(netcp, GBE_TXHOOK_ORDER, gbe_tx_hook,
+                    gbe_intf);
+    if (ret)
+        goto fail;

       slave->open = true;
       netcp_ethss_update_link_state(gbe_dev, slave, ndev);

Acked-by: Murali Karicheri <redacted>

Murali,
I was wondering if this patch is being merged as I haven't seen in move into David's network
tree with the merged of your driver's tree.
Nick

Nick,

Not sure what else I need to do to get it applied to net repo.

David,

Can this be applied to net/master ?

Thanks

-- 
Murali Karicheri
Linux Kernel, Keystone