From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-wpan-owner@vger.kernel.org>
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:33273 "EHLO
	out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1750868AbbFILaz (ORCPT
	<rfc822;linux-wpan@vger.kernel.org>); Tue, 9 Jun 2015 07:30:55 -0400
Received: from compute5.internal (compute5.nyi.internal [10.202.2.45])
	by mailout.nyi.internal (Postfix) with ESMTP id C73DD21ACC
	for <linux-wpan@vger.kernel.org>; Tue,  9 Jun 2015 07:30:54 -0400 (EDT)
Message-ID: <5576CE6D.8060609@signal11.us>
Date: Tue, 09 Jun 2015 07:30:53 -0400
From: Alan Ott <alan@signal11.us>
MIME-Version: 1.0
Subject: Re: [PATCH bluetooth-next] ieee802154/mrf24j40: make sure we do not
 override return values
References: <1433768651-5458-1-git-send-email-stefan@osg.samsung.com> <DF4347EC-065D-4C46-947D-149085EDD466@holtmann.org> <5576A941.7030402@osg.samsung.com>
In-Reply-To: <5576A941.7030402@osg.samsung.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-wpan-owner@vger.kernel.org
List-ID: <linux-wpan.vger.kernel.org>
To: Stefan Schmidt <stefan@osg.samsung.com>, Marcel Holtmann <marcel@holtmann.org>
Cc: linux-wpan@vger.kernel.org, Alexander Aring <alex.aring@gmail.com>

On 06/09/2015 04:52 AM, Stefan Schmidt wrote:
> Hello.
>
> On 09/06/15 09:42, Marcel Holtmann wrote:
>> Hi Stefan,
>>
>>> If we run into an error during rx we set the the error code in ret, 
>>> but override
>>> it afterwards. Using a different variable for the extra case avoids 
>>> this
>>> situation.
>>>
>>> CID: 1226982, 1226983
>>> Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
>>> Cc: Alan Ott <alan@signal11.us>
>>> ---
>>> drivers/net/ieee802154/mrf24j40.c | 7 ++++---
>>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/net/ieee802154/mrf24j40.c 
>>> b/drivers/net/ieee802154/mrf24j40.c
>>> index 99c7676..0b9b2ae 100644
>>> --- a/drivers/net/ieee802154/mrf24j40.c
>>> +++ b/drivers/net/ieee802154/mrf24j40.c
>>> @@ -533,6 +533,7 @@ static int mrf24j40_handle_rx(struct mrf24j40 
>>> *devrec)
>>>     u8 lqi = 0;
>>>     u8 val;
>>>     int ret = 0;
>>> +    int ret2 = 0;
>>>     struct sk_buff *skb;
>>>
>>>     /* Turn off reception of packets off the air. This prevents the
>>> @@ -569,9 +570,9 @@ static int mrf24j40_handle_rx(struct mrf24j40 
>>> *devrec)
>>>
>>> out:
>>>     /* Turn back on reception of packets off the air. */
>>> -    ret = read_short_reg(devrec, REG_BBREG1, &val);
>>> -    if (ret)
>>> -        return ret;
>>> +    ret2 = read_short_reg(devrec, REG_BBREG1, &val);
>>> +    if (ret2)
>>> +        return ret2;

Don't you want to say "return ret" here?

Alan.