diff options
| author | Pavel Skripkin <paskripkin@gmail.com> | 2022-01-20 20:37:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-15 14:14:56 +0200 |
| commit | 04562b19770832fc53d142200d829ba7db64d1a0 (patch) | |
| tree | 427cf175e5a85bf4abaec0094fc0b717f8797d29 /drivers/media/usb | |
| parent | 1aea36a62f0a0ad67eccc945bac0bd6422ef720f (diff) | |
| download | linux-stable-04562b19770832fc53d142200d829ba7db64d1a0.tar.gz linux-stable-04562b19770832fc53d142200d829ba7db64d1a0.tar.bz2 linux-stable-04562b19770832fc53d142200d829ba7db64d1a0.zip | |
media: Revert "media: em28xx: add missing em28xx_close_extension"
[ 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 <maximilian.boehm@elbmurf.de>
Tested-by: Maximilian Böhm <maximilian.boehm@elbmurf.de>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media/usb')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index c7f79d0f3883..b14bff7b4ec8 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -4036,11 +4036,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) { |