From: Murali Karicheri <m-karicheri2@ti.com>
To: nick <xerofoify@gmail.com>, <w-kwok2@ti.com>, <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] netcp:Fix error checking in the function gbe_open
Date: Thu, 20 Aug 2015 18:05:16 -0400 [thread overview]
Message-ID: <55D64F1C.3070509@ti.com> (raw)
In-Reply-To: <55CCB713.8000406@gmail.com>
On 08/13/2015 11:26 AM, nick wrote:
>
>
> On 2015-07-30 03:44 PM, Murali Karicheri wrote:
>> On 07/30/2015 02:27 PM, Nicholas Krause wrote:
>>> 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 <xerofoify@gmail.com>
>>> ---
>>> 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 <m-karicheri2@ti.com>
>>
> 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
prev parent reply other threads:[~2015-08-20 22:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1438280850-9613-1-git-send-email-xerofoify@gmail.com>
2015-07-30 19:44 ` [PATCH] netcp:Fix error checking in the function gbe_open Murali Karicheri
[not found] ` <55CCB713.8000406@gmail.com>
2015-08-20 22:05 ` Murali Karicheri [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55D64F1C.3070509@ti.com \
--to=m-karicheri2@ti.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=w-kwok2@ti.com \
--cc=xerofoify@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.