summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMaxim Mikityanskiy <maxtram95@gmail.com>2021-02-06 01:51:39 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-03-11 13:40:28 +0300
commit8a7e27fd5cd696ba564a3f62cedef7269cfd0723 (patch)
tree342ad489b0a35d0957410ccad3ccbe49923a12d2 /drivers/media
parentf09f9f93afad770a04b35235a0aa465fcc8d6e3d (diff)
downloadlinux-8a7e27fd5cd696ba564a3f62cedef7269cfd0723.tar.xz
media: usbtv: Fix deadlock on suspend
usbtv doesn't support power management, so on system suspend the .disconnect callback of the driver is called. The teardown sequence includes a call to snd_card_free. Its implementation waits until the refcount of the sound card device drops to zero, however, if its file is open, snd_card_file_add takes a reference, which can't be dropped during the suspend, because the userspace processes are already frozen at this point. snd_card_free waits for completion forever, leading to a hang on suspend. This commit fixes this deadlock condition by replacing snd_card_free with snd_card_free_when_closed, that doesn't wait until all references are released, allowing suspend to progress. Fixes: 63ddf68de52e ("[media] usbtv: add audio support") Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/usbtv/usbtv-audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c
index b57e94fb1977..333bd305a4f9 100644
--- a/drivers/media/usb/usbtv/usbtv-audio.c
+++ b/drivers/media/usb/usbtv/usbtv-audio.c
@@ -371,7 +371,7 @@ void usbtv_audio_free(struct usbtv *usbtv)
cancel_work_sync(&usbtv->snd_trigger);
if (usbtv->snd && usbtv->udev) {
- snd_card_free(usbtv->snd);
+ snd_card_free_when_closed(usbtv->snd);
usbtv->snd = NULL;
}
}