From patchwork Wed Jun 3 09:26:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuhong Yuan X-Patchwork-Id: 64199 X-Patchwork-Delegate: sean@mess.org Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1jgPc6-00G0nt-Nn; Wed, 03 Jun 2020 09:23:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726315AbgFCJ05 (ORCPT + 1 other); Wed, 3 Jun 2020 05:26:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725943AbgFCJ05 (ORCPT ); Wed, 3 Jun 2020 05:26:57 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB5F2C05BD43; Wed, 3 Jun 2020 02:26:56 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id x22so1240095pfn.3; Wed, 03 Jun 2020 02:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iFs/P0L8u0SRxxxhK/lyOIunYVt5h41AqSCalRyPGJI=; b=COLRVPPa0xwQp41D2aytWhQaPlAnV8FWmDhJ0wTN5wYTYTVrgiitczPOaPHF8ybO9Z 4saX1DcAQckaL56o2a8dhcRem1Wr4MtGj4xWMwt+JxgI7aQnidew9jU0JYlPgGmThnYZ hF4E1HoYYGJaVle2Iv/bxa0m/9I4JTqXlsRTTIULjLNkJu5EHV/asm9NrogEpxPOvBT8 qw3FFWWozK3qh5DZO6aScSQEpDaKG2f0JAWLAvbhA0BBf+i2BNClyA9MJt+LLVHwvd0G Pm+xNYcrK8czzb+b/q49zfD64wOlhHIDD3TfPN1rV9As9ZC39LPb+VjK+TOtZ1w32jVZ rrwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iFs/P0L8u0SRxxxhK/lyOIunYVt5h41AqSCalRyPGJI=; b=cCgVkY8G+hn3A0QdtXbsMgZ9kQEWBaXwEEAk2YGS2T7yz1KDHeVkZsv7V4c9FwTbf+ 7oNPqvYSb7zjsfwfFKbCuealj+akrkRk/DERZTDA0gRz0L6omnXsDWb2ajmEc/cLecFS fLrsEztW2zya5OYvTR8kTOGKG6oiIgniOmW6cDiCA0XAxLCKpLkiK7J7h8bagbuPALOg BXKDnKYRO3XwK7tcxGWYFMK0+7867b22R34k3Gkda8bW6dHI7Il/YMWwa/zMHYKIMz1k 6HiVYHXAS4UwF+tYzTvp8O0+M6z7UBwvEWhcFzoXHuFoLgOcsKPzyh3ia6thGMn3kXhm MXQg== X-Gm-Message-State: AOAM531QO1x2mTLD2f6odIaWW5DHxUVh8/tWQEusK2eZ1sSlZuTpUptg B5hD8dIxUQ2tzB0/vm6rGds= X-Google-Smtp-Source: ABdhPJyowqKTl3scWSLvJtESVWovnaENZ07yN8WVzVyDZ1+IheJhc+KCbYryvhHsYYlZ7HY7KSEafQ== X-Received: by 2002:a17:90b:2350:: with SMTP id ms16mr4621240pjb.163.1591176416494; Wed, 03 Jun 2020 02:26:56 -0700 (PDT) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([202.120.40.82]) by smtp.gmail.com with ESMTPSA id 4sm1420546pfn.205.2020.06.03.02.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 02:26:56 -0700 (PDT) From: Chuhong Yuan Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH] media: budget-core: Add missed undo functions in budget_register() Date: Wed, 3 Jun 2020 17:26:48 +0800 Message-Id: <20200603092648.1424548-1-hslester96@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -0.8 (/) X-LSpam-Report: No, score=-0.8 required=5.0 tests=BAYES_00=-1.9,DKIM_ADSP_CUSTOM_MED=0.001,DKIM_SIGNED=0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_SORBS_WEB=1.5,T_DKIM_INVALID=0.01 autolearn=no autolearn_force=no budget_register() has no error handling after its failure. Add the missed undo functions for error handling to fix it. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Chuhong Yuan --- drivers/media/pci/ttpci/budget-core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/ttpci/budget-core.c b/drivers/media/pci/ttpci/budget-core.c index fadbdeeb4495..53aa34a3160b 100644 --- a/drivers/media/pci/ttpci/budget-core.c +++ b/drivers/media/pci/ttpci/budget-core.c @@ -369,20 +369,25 @@ static int budget_register(struct budget *budget) ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->hw_frontend); if (ret < 0) - return ret; + goto err; budget->mem_frontend.source = DMX_MEMORY_FE; ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &budget->mem_frontend); if (ret < 0) - return ret; + goto err; ret = dvbdemux->dmx.connect_frontend(&dvbdemux->dmx, &budget->hw_frontend); if (ret < 0) - return ret; + goto err; dvb_net_init(&budget->dvb_adapter, &budget->dvb_net, &dvbdemux->dmx); return 0; + +err: + dvb_dmxdev_release(&budget->dmxdev); + dvb_dmx_release(&budget->demux); + return ret; } static void budget_unregister(struct budget *budget)