From patchwork Tue Sep 29 10:59:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290763 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=-13.5 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=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 ED6F5C4727C for ; Tue, 29 Sep 2020 12:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9632F2076A for ; Tue, 29 Sep 2020 12:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601383227; bh=JFVlvpvlwucfKo0vEKTMKIoHAIksnx2Ytuz0jEC6y6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f+1TgOXtiC/TqVPuGgKT25ls4I5N90cSuV7YMtokk9316KMmmeCyOYKu4zriU+NBB IQL2v/4Aso/NU11l4yCDsmOHQLjGy+gkVRdYhPFiiTrztg++iL36JVMXFE+4Y52yFy bQ72W5vG8SSN4Q9NO9G8vEFfejW+ufSt/Lc3a2UQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732888AbgI2MkY (ORCPT ); Tue, 29 Sep 2020 08:40:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:59572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729514AbgI2LPS (ORCPT ); Tue, 29 Sep 2020 07:15:18 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 E3D9420848; Tue, 29 Sep 2020 11:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378117; bh=JFVlvpvlwucfKo0vEKTMKIoHAIksnx2Ytuz0jEC6y6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ltvxx8I3IKDRijZ/uTQx1dDWadoPfwC8hUdu97S5xM2WVRFWIhSxXG9UyzKtosdWd PZRVymBxKEyLH9IoC4d1bWi3CsD2aMzi3TCB/tfRORXxidZTVzuqXtT+9tcvirXLf0 uxqNNSd1k0e5buzKS/7SQAf10SaOuZA8VeAcTMPE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Steve Longerbeam , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 068/166] media: staging/imx: Missing assignment in imx_media_capture_device_register() Date: Tue, 29 Sep 2020 12:59:40 +0200 Message-Id: <20200929105938.618065616@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105935.184737111@linuxfoundation.org> References: <20200929105935.184737111@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter [ Upstream commit ef0ed05dcef8a74178a8b480cce23a377b1de2b8 ] There was supposed to be a "ret = " assignment here, otherwise the error handling on the next line won't work. Fixes: 64b5a49df486 ("[media] media: imx: Add Capture Device Interface") Signed-off-by: Dan Carpenter Reviewed-by: Steve Longerbeam Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/imx/imx-media-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index ea145bafb880a..8ff8843df5141 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -685,7 +685,7 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) /* setup default format */ fmt_src.pad = priv->src_sd_pad; fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; - v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt_src); + ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt_src); if (ret) { v4l2_err(sd, "failed to get src_sd format\n"); goto unreg;