From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752030AbdJ2UOA (ORCPT ); Sun, 29 Oct 2017 16:14:00 -0400 Received: from mout.web.de ([212.227.15.14]:64978 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751315AbdJ2UN5 (ORCPT ); Sun, 29 Oct 2017 16:13:57 -0400 Subject: [PATCH 3/5] wlcore: Return directly after a failed ieee80211_beacon_get() in wlcore_set_beacon_template() From: SF Markus Elfring To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Arend Van Spriel , Eyal Reizer , Iain Hunter , James Minor , Johannes Berg , Kalle Valo , Maxim Altshul , Pieter-Paul Giesberts Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <6ea50cb4-8871-6752-6275-50da266f0e7d@users.sourceforge.net> Date: Sun, 29 Oct 2017 21:13:44 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:DzMV4OnnwDfoCU+H0hts46m/Ir1SB9a1OEGr8QUHCHWDsWupr6d 5o4ca+xAeT6Bd9/HsBmbGbPmSrjjEwnwd6v9hJ69BHJowiH5+PqdtpT6w0alytNc9wGLW2x hp1P0tB1UqU9n7WCJktdx4Eioeb4/LC7JSEaVuFGevKWdOj0XDe2I7A6AdBoX0rDJ7f1L+v IgxQuJcfbYnDNvMCoMcRw== X-UI-Out-Filterresults: notjunk:1;V01:K0:px6IPubvfog=:Bw765UlUYNoYWDfrrrV2hE nl/MOqCXHYKkULRjRKpQTSjNc0/Iypt2bPOB175K5QpQlhV/fysfXvbh8hfHcRaVW0IXTO+Av TCdra3cVZU9clLVm6EM0GFe7qo3QJzKkCJSWFSXZ+SQaIzKshFfAM/7i+1SOvVHcnaHvN0w+n LH4xP8kYsnQPNWUbdcd0EHdtOhIpN841LJxQIDUMxt6noJSACiE3MHE9+OOWNnzn0hjl0alod dcJ9a71aFXowEO7kFGGVZUr8rnWO+YBJjoXRsI/Lyoy94ZXvhl3Q0V0tVxkQtyLa0S2Ycz1XQ Sx3F2k8PfgF/n0PzFkvfYYKTkhh8762HJAXWHOkkuVAy9Fxfq6CNw+uuUCkQO8RoB53EG+3pD dQxWK7Q1DHyASXHaPIXgvj+0ak+B5TJSd2E9a0Y+7PHJhcMxQmdMTkE8sUec+qpg+zDLZWxP4 S+/qzHenNaxivVD0ON/owM0SMjEMvNH2hioPJlYBPogLR0wXsS/qsE637s4rQABapJGIX7GKq VOLmpGiN6FAnZip5cRemc0NH3jrIGQdGpuVDeRSR95TyWIK9SXEykRqBqvCdHucBx1Kdr/Egw LISypx+btG0zhuFkAJ2p8FhxFXJSIoJTxFkIdvPj0GrgLhEl6b4OuuFNaDJ45cB0W5RDlsAXd iF9wv4QaAFGzK4rCiywlAe6O31/9xUZaiH/bNM+fWDsAEvDCctOnl8kQN8BbYteXIArcmA6qT UAen1ozlfXt8ADPSJUGw7F820uWPRSKIasM8EPhr01MoQYnWQarw3eK58i+OrRlFDojwj7Njb NvO38scdZH8YsquPVOW/D0MRAxKPVvFDbVRQZiTsKOKOmOP62o= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 29 Oct 2017 20:00:41 +0100 Return directly after a call of the function "ieee80211_beacon_get" failed at the beginning. Signed-off-by: Markus Elfring --- drivers/net/wireless/ti/wlcore/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index efea811c1c83..0365b5e40a8d 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -4018,10 +4018,8 @@ static int wlcore_set_beacon_template(struct wl1271 *wl, struct sk_buff *beacon = ieee80211_beacon_get(wl->hw, vif); u16 tmpl_id; - if (!beacon) { - ret = -EINVAL; - goto out; - } + if (!beacon) + return -EINVAL; wl1271_debug(DEBUG_MASTER, "beacon updated"); -- 2.14.3