| Message ID | 20220120193730.28155-1-paskripkin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Revert "media: em28xx: add missing em28xx_close_extension" | expand |
Tested-by: Maximilian Böhm, kernelml@elbmurf.de Am 20.01.22 um 20:37 schrieb Pavel Skripkin: > 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. > > Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl> > Link: https://lore.kernel.org/all/6a72a37b-e972-187d-0322-16336e12bdc5@elbmurf.de/ [1] > Reported-by: Maximilian Böhm <maximilian.boehm@elbmurf.de> > Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> > --- > 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) {
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) {
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. Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl> Link: https://lore.kernel.org/all/6a72a37b-e972-187d-0322-16336e12bdc5@elbmurf.de/ [1] Reported-by: Maximilian Böhm <maximilian.boehm@elbmurf.de> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> --- drivers/media/usb/em28xx/em28xx-cards.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)