Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp2215618pxb; Wed, 30 Mar 2022 19:36:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpO3sn3ix7wMhVTwKN2Vf77NlQHNby5B3eWs5p6wwF+B1FapSfJePJ6mMYg+JIMQvZNFz4 X-Received: by 2002:a17:902:7205:b0:156:1a0a:2c39 with SMTP id ba5-20020a170902720500b001561a0a2c39mr3082753plb.88.1648694183909; Wed, 30 Mar 2022 19:36:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648694183; cv=none; d=google.com; s=arc-20160816; b=eXJ9ywFCuKZnSB+KTWHvY/+yWJgcHS2iDfNR0jJJtQyGstUwG72fu2Ai1RHm00YGDd zQqaD0GHn0rvcpfXq1qR88EMoa/jIEGknS7oBjgxs4viSjd77UIbVReFITD6Plbty84n n8eFpQFtG5ObcXmnGuZAA36WzRrx7Opb0nW694Gz+HlWZzCTKmPB2nCBZo5fLS307R2O 8+WLgzjqehzQOho33jX5TAXagXaD3JRUzjZeszFltuj/KUuKgDq9sAHGsjDD9jVIrnG7 Sdp+vLoGIFGWArexv/6q4XshaOSGcpg8JKVT0EA2aVxA5Wakgs0r1SGzZlazdD2JtMAF ku8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QgyCyMS6gVNfgJOgggsAqvxmzUQbMYRslVC6J44s/nM=; b=ystPFtgsulW7bFLoEXfdiu8MybEC6Ao/nz59n9iT/DkjQTHDiLumSnjX9qXupo42W/ SP+/nxC/Cm5yjFHVmw+WSgb1dv1gWFgdjZHj5mx5UJ3SQAe8fmA2HJezfgRoTikyQjUv 7IP99j5mz43Y+7zNhLwq41POT0fly9sumST7nvt+wp/UQToMEmNi6PqdyNef3mSlzX/I iNJPLSM2QfXXDVO+Bspeg6uAQ7HOI1q0DrxaIJ2sWT0jMetqUIdErx6PGdU6Lsb+gRtV K/SpTdp/9o+v5PzieQ1WqvwA9PYDia8nuLqAJjiBY+QvZpyfIw6Li6OkhAuAYCi4Lgfw HdiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vQN6+uEC; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id b11-20020a056a000a8b00b004fab35f2191si25427626pfl.194.2022.03.30.19.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Mar 2022 19:36:23 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vQN6+uEC; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 128CA93990; Wed, 30 Mar 2022 19:31:34 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244471AbiC3MJ2 (ORCPT + 99 others); Wed, 30 Mar 2022 08:09:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344865AbiC3Lxn (ORCPT ); Wed, 30 Mar 2022 07:53:43 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D8C627BC27; Wed, 30 Mar 2022 04:49:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 19493CE1D04; Wed, 30 Mar 2022 11:49:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2B4EC34112; Wed, 30 Mar 2022 11:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648640986; bh=ggnRzu8aJoUeHTT+3KPleG8rjSsvXE/6Q+QS76nVfVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vQN6+uECvq8/RQhnfD19xQElYVELRYP/e7i4tcOaayKthi7VJR8xm6vQ7nXNJV3F8 YN9/B2FB1lz5C+AeJEMIFUamMgu1i1HEngXYQjpyAqJiR6qx6O9PZlVFghLqQ8jP6/ qbWxoMr+7vyB/pIxJSVp6aHTPG5DzYHWsbkiBCKx5RV+MVZnnT8/n8+APbiHZg7+SW Riii+LwVri7+HGvdoz68qEqw42Jwn9sVMO4NJufjj0FCCuck96gVScUsF+85gZPtV1 eJQm8jwxJbuUAqJyuOP3PUdH81aw4cX4aLuKoSQvPZcr2pi/feGBIl+iHSgq5m0HIO k7xkpga5oqOCw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pavel Skripkin , =?UTF-8?q?Maximilian=20B=C3=B6hm?= , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 48/59] media: Revert "media: em28xx: add missing em28xx_close_extension" Date: Wed, 30 Mar 2022 07:48:20 -0400 Message-Id: <20220330114831.1670235-48-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330114831.1670235-1-sashal@kernel.org> References: <20220330114831.1670235-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Skripkin [ Upstream commit fde18c3bac3f964d8333ae53b304d8fee430502b ] This reverts commit 2c98b8a3458df03abdc6945bbef67ef91d181938. Reverted patch causes problems with Hauppauge WinTV dualHD as Maximilian reported [1]. Since quick solution didn't come up let's just revert it to make this device work with upstream kernels. Link: https://lore.kernel.org/all/6a72a37b-e972-187d-0322-16336e12bdc5@elbmurf.de/ [1] Reported-by: Maximilian Böhm Tested-by: Maximilian Böhm Signed-off-by: Pavel Skripkin Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/em28xx/em28xx-cards.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index b451ce3cb169..4a46ef50baf9 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -4150,11 +4150,8 @@ static void em28xx_usb_disconnect(struct usb_interface *intf) em28xx_close_extension(dev); - if (dev->dev_next) { - em28xx_close_extension(dev->dev_next); + if (dev->dev_next) em28xx_release_resources(dev->dev_next); - } - em28xx_release_resources(dev); if (dev->dev_next) { -- 2.34.1