lkml.org 
[lkml]   [2022]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.16 48/59] media: Revert "media: em28xx: add missing em28xx_close_extension"
    Date
    From: Pavel Skripkin <paskripkin@gmail.com>

    [ 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>
    ---
    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
    \
     
     \ /
      Last update: 2022-03-30 14:31    [W:3.081 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site