From patchwork Thu Aug 20 09:21:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 265519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18392C433E1 for ; Thu, 20 Aug 2020 11:55:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0F8C207BB for ; Thu, 20 Aug 2020 11:55:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597924534; bh=7JvEIUdPWVk1UdixZoBPCQ1DY5YCc+fVM11ymS5y2hg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OOV9ukFE5Fw2Dn3+PZrHrIJIoIAWe+7dyWtwlPBINmo03mQ3GUmQzpAcwJ7quSBj/ ulLOd4RiUjfei7lhh1Ndn8NrPdrMDSlTSWfycJ1OnUKj8mT3fDALy7dGkyMZOIj+Tn lkYalvqBMA+KO3D+tRTO4qORsgrjmSCpC9oL+hDM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729148AbgHTLzc (ORCPT ); Thu, 20 Aug 2020 07:55:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:53210 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730406AbgHTKCU (ORCPT ); Thu, 20 Aug 2020 06:02:20 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 430572075E; Thu, 20 Aug 2020 10:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917739; bh=7JvEIUdPWVk1UdixZoBPCQ1DY5YCc+fVM11ymS5y2hg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vwO0rKyXK49t5W60TJa2CKiF3HViyx4greGd+JMIWx1udfgTkZySH6SRyqpp7cWTY AzO8p3JITIv7B4Sx3rz5WGpT5KHtiQs4p5cPYS1QiX+JYLrww4biUTP4Xop8+84qhm naboHq6mdTaP0SSkRUhtU2GeUc1RT3Loy++s4Mcg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Wang Hai , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 141/212] wl1251: fix always return 0 error Date: Thu, 20 Aug 2020 11:21:54 +0200 Message-Id: <20200820091609.468897067@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091602.251285210@linuxfoundation.org> References: <20200820091602.251285210@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wang Hai [ Upstream commit 20e6421344b5bc2f97b8e2db47b6994368417904 ] wl1251_event_ps_report() should not always return 0 because wl1251_ps_set_mode() may fail. Change it to return 'ret'. Fixes: f7ad1eed4d4b ("wl1251: retry power save entry") Reported-by: Hulk Robot Signed-off-by: Wang Hai Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200730073939.33704-1-wanghai38@huawei.com Signed-off-by: Sasha Levin --- drivers/net/wireless/ti/wl1251/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ti/wl1251/event.c b/drivers/net/wireless/ti/wl1251/event.c index d0593bc1f1a92..daddeaa66bf4a 100644 --- a/drivers/net/wireless/ti/wl1251/event.c +++ b/drivers/net/wireless/ti/wl1251/event.c @@ -84,7 +84,7 @@ static int wl1251_event_ps_report(struct wl1251 *wl, break; } - return 0; + return ret; } static void wl1251_event_mbox_dump(struct event_mailbox *mbox)