From patchwork Mon Jun 13 19:51:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 581496 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D78B5CCA486 for ; Mon, 13 Jun 2022 20:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350514AbiFMUqD (ORCPT ); Mon, 13 Jun 2022 16:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346511AbiFMUpL (ORCPT ); Mon, 13 Jun 2022 16:45:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E497327CE7 for ; Mon, 13 Jun 2022 12:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655149964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lDpxrrWuqYclxW1MpEBHFP2+Ml23+mJBQ9r8ye+b0QE=; b=GkpuLS/cHcsi+reHXi8rQtHZLdN3UIYNTgHexX0l8fEirlFAHylER3GBHqHK++Qk0LJ3PZ ahjIDjY4EXTTMChf1PNImma+EzFIqejdHmI11WpyQahf79+pbrIkt0RoLzQD27H/OHZCoV Y+3OohW8qZNjE8vV1PIBylrZ+YGfdq8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-202-EIQkwZKKO9uCPbxC3LypTg-1; Mon, 13 Jun 2022 15:52:39 -0400 X-MC-Unique: EIQkwZKKO9uCPbxC3LypTg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FD3929ABA2E; Mon, 13 Jun 2022 19:52:38 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id E88682166B26; Mon, 13 Jun 2022 19:52:36 +0000 (UTC) From: Hans de Goede To: Mauro Carvalho Chehab , Sakari Ailus Cc: Hans de Goede , Tsuchiya Yuto , Andy Shevchenko , Yury Luneff , Nable , andrey.i.trufanov@gmail.com, Fabio Aiuto , linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH 33/40] media: atomisp: fix __get_frame_info() error handling Date: Mon, 13 Jun 2022 21:51:30 +0200 Message-Id: <20220613195137.8117-34-hdegoede@redhat.com> In-Reply-To: <20220613195137.8117-1-hdegoede@redhat.com> References: <20220613195137.8117-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On ia_css_pipe_get_info() errors, destroy both the streams as well as the pipes which were created. Signed-off-by: Hans de Goede --- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c index 6e91654ce5da..d03b29add5c3 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c @@ -2653,7 +2653,7 @@ static int __get_frame_info(struct atomisp_sub_device *asd, &p_info); if (ret) { dev_err(isp->dev, "can't get info from pipe\n"); - goto stream_err; + goto get_info_err; } switch (type) { @@ -2684,6 +2684,8 @@ static int __get_frame_info(struct atomisp_sub_device *asd, return 0; +get_info_err: + __destroy_streams(asd, true); stream_err: __destroy_pipes(asd, true); return -EINVAL;