From patchwork Fri Jan 24 09:27:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233006 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=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 3B712C2D0DB for ; Fri, 24 Jan 2020 11:14:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 055382077C for ; Fri, 24 Jan 2020 11:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864493; bh=ATvV5aO3Q+1ZZNMBqATJdw0PM1xhhuD+zZQmgrDNI8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rZbd6CXOhL9dP/p+ZtjpSQF8W+EInOloDBb69H47qRc96LOfarPVOk6PMb9IAnjGi Lq/aI/1He/ycQhCPRMvjj0K7833ma0ki3NBIPYWeTLwbcdLi4TmOku9pfVhWq9mIuW QLU7Tk0dsbyntWbBA1PhCkk5Ef9vqrpiEtUYecO8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389737AbgAXLOv (ORCPT ); Fri, 24 Jan 2020 06:14:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:51254 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389143AbgAXLOu (ORCPT ); Fri, 24 Jan 2020 06:14:50 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 91F8420663; Fri, 24 Jan 2020 11:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864490; bh=ATvV5aO3Q+1ZZNMBqATJdw0PM1xhhuD+zZQmgrDNI8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zFSTCeJpjZtIvRC9nHqNW+E+2hYABcCT2csnE6glUSa4IfbM2iHbGBObgeoxBRP+p nTPjDjj3Bw29O1yXLgJPi/ddZMSV6dxP47tjqun+jw4eLFWGCICPVECcoSA74E0QbV k+AbZ/RcTYh4zyDplPVNW21DG8A93BfVvaHUXQLs= 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.19 266/639] media: wl128x: Fix an error code in fm_download_firmware() Date: Fri, 24 Jan 2020 10:27:16 +0100 Message-Id: <20200124093120.038179704@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: 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 1cf4019689a56..cccf1a743f4e6 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++;