From mboxrd@z Thu Jan 1 00:00:00 1970 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 E9CC8C47088 for ; Wed, 30 Mar 2022 12:06:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347632AbiC3MHS (ORCPT ); Wed, 30 Mar 2022 08:07:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345934AbiC3LzN (ORCPT ); Wed, 30 Mar 2022 07:55:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8B232BF2; Wed, 30 Mar 2022 04:52:58 -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 ams.source.kernel.org (Postfix) with ESMTPS id 57F93B81C28; Wed, 30 Mar 2022 11:52:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D2E1C36AE3; Wed, 30 Mar 2022 11:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641176; bh=xlVLfQ8SqePoNJyfOFHom3vupBlURqLqC/RgmldWlrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o4oN2NkkkvudmII3uhLWLk1S8mpfycB6gW4VOzAFz/Butk5hCksOSI9HMAvdq72EH cLPozxY8LLSJUCPHfDOzfI4tIdjfjUO1Csp8Kz+3O5jyn6dfLBZ3/kdgoQenzez3oh mdoWPfxuBH6+JRMRDu9ZPKw6XIk16GrF/rEqVYm8tnpPMRc2bNW92/PxNVAAVWgtYK 9Py0ZA9wYk5+lzTPQbqH9SUYJd9uh/XgY2oq/d5MRaZ7+BR71WcZTWk5nIpBxLxmtE k8Gxy/k/xTg/Ph5jkS1fMUeS/iXaTjKgO8MWJ5EzSgb+rv/M3asPwA1sHDiJyRMKX/ E1hEjnbS3y8AQ== 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.4 20/25] media: Revert "media: em28xx: add missing em28xx_close_extension" Date: Wed, 30 Mar 2022 07:52:20 -0400 Message-Id: <20220330115225.1672278-20-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115225.1672278-1-sashal@kernel.org> References: <20220330115225.1672278-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 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 bfca9d0a1fe1..64f2033c2731 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -4035,11 +4035,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