From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 70348C32771 for ; Fri, 24 Jan 2020 09:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BB3A20718 for ; Fri, 24 Jan 2020 09:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859575; bh=xXGaGt40muQ8U38q6p3gSYtJgcyk8X9X5aajcz93LKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SgmtiFMS7F4K0VuyOhUaUkLuGh2r4vHmS/BauftZrt7hUtrCv3enQF9Mwnxm2upWT hlnTPa11hWq7ECjEHqAtpfuPIq9m+lzGLJShZvEFaMgWSpbw5roMk+0i//q9kUigyA grCl5BXe/rRpx5vI59jQgzGyAOmLiXsqemnEJSTk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388039AbgAXJwy (ORCPT ); Fri, 24 Jan 2020 04:52:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:54980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731453AbgAXJww (ORCPT ); Fri, 24 Jan 2020 04:52:52 -0500 Received: from localhost (unknown [145.15.244.15]) (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 9FB3F214AF; Fri, 24 Jan 2020 09:52:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859572; bh=xXGaGt40muQ8U38q6p3gSYtJgcyk8X9X5aajcz93LKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K7oYcHWNvLOhGdnHdJcsNKDGpqHqR3bknBXqJmkkmgaUTuAt/VpsPqg1fgM7ztG0u 3QWmuW+b8GzBpqS/fECZzG2OW6mB0ILmpAHU43gKRArNATpOOayIl5BgXyVjXYpUqr oHMlMbRNKQkarTsZBbqqmfDvuErSJ57swuMHejH8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 146/343] media: wl128x: Fix an error code in fm_download_firmware() Date: Fri, 24 Jan 2020 10:29:24 +0100 Message-Id: <20200124092939.226091473@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit ef4bb63dc1f7213c08e13f6943c69cd27f69e4a3 ] We forgot to set "ret" on this error path. Fixes: e8454ff7b9a4 ("[media] drivers:media:radio: wl128x: FM Driver Common sources") Signed-off-by: Dan Carpenter Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/radio/wl128x/fmdrv_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index 26895ae42fcf4..2d20d908e2803 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c @@ -1271,8 +1271,9 @@ static int fm_download_firmware(struct fmdev *fmdev, const u8 *fw_name) switch (action->type) { case ACTION_SEND_COMMAND: /* Send */ - if (fmc_send_cmd(fmdev, 0, 0, action->data, - action->size, NULL, NULL)) + ret = fmc_send_cmd(fmdev, 0, 0, action->data, + action->size, NULL, NULL); + if (ret) goto rel_fw; cmd_cnt++; -- 2.20.1