From: "Venkataramanan, Anirudh" <anirudh.venkataramanan@intel•com>
To: "Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel•com>,
"weiyongjun1@huawei•com" <weiyongjun1@huawei•com>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"intel-wired-lan@lists•osuosl.org"
<intel-wired-lan@lists•osuosl.org>,
"kernel-janitors@vger•kernel.org"
<kernel-janitors@vger•kernel.org>
Subject: Re: [Intel-wired-lan] [PATCH net-next] ice: Fix error return code in ice_init_hw()
Date: Thu, 29 Mar 2018 16:31:31 +0000 [thread overview]
Message-ID: <1522341089.15392.172.camel@intel.com> (raw)
In-Reply-To: <1522241445-77090-1-git-send-email-weiyongjun1@huawei.com>
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
On Wed, 2018-03-28 at 12:50 +0000, Wei Yongjun wrote:
> Fix to return error code ICE_ERR_NO_MEMORY from the alloc error
> handling case instead of 0, as done elsewhere in this function.
>
> Fixes: dc49c7723676 ("ice: Get MAC/PHY/link info and scheduler
> topology")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei•com>
> ---
> drivers/net/ethernet/intel/ice/ice_common.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c
> b/drivers/net/ethernet/intel/ice/ice_common.c
> index 385f5d4..21977ec 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -468,8 +468,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
> mac_buf_len = sizeof(struct ice_aqc_manage_mac_read_resp);
> mac_buf = devm_kzalloc(ice_hw_to_dev(hw), mac_buf_len,
> GFP_KERNEL);
>
> - if (!mac_buf)
> + if (!mac_buf) {
> + status = ICE_ERR_NO_MEMORY;
> goto err_unroll_fltr_mgmt_struct;
> + }
>
> status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len,
> NULL);
> devm_kfree(ice_hw_to_dev(hw), mac_buf);
>
Acked-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel•com>
Thanks!
Ani
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3302 bytes --]
prev parent reply other threads:[~2018-03-29 16:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 12:50 [PATCH net-next] ice: Fix error return code in ice_init_hw() Wei Yongjun
2018-03-29 16:31 ` Venkataramanan, Anirudh [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=1522341089.15392.172.camel@intel.com \
--to=anirudh.venkataramanan@intel$(echo .)com \
--cc=intel-wired-lan@lists$(echo .)osuosl.org \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=kernel-janitors@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=weiyongjun1@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox