diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-16 05:13:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-16 05:13:45 +0300 |
| commit | c926a55f650ce58eae33cda504d50ac1837d53fd (patch) | |
| tree | 1e7bd86093fb33a40f834ed580d57e0fdbc4be65 /include | |
| parent | 62d8779610bb7a7b8f9c7ab8bf317193ebe76d93 (diff) | |
| parent | ec21a38df77a5aefbd2f70c48127003b6f259cf3 (diff) | |
| download | linux-c926a55f650ce58eae33cda504d50ac1837d53fd.tar.xz | |
Merge tag 'media/v6.4-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"A fix for dvb-core to avoid a race condition during DVB board
registration"
* tag 'media/v6.4-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
Revert "media: dvb-core: Fix use-after-free on race condition at dvb_frontend"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/dvb_frontend.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/media/dvb_frontend.h b/include/media/dvb_frontend.h index 367d5381217b..e7c44870f20d 100644 --- a/include/media/dvb_frontend.h +++ b/include/media/dvb_frontend.h @@ -686,10 +686,7 @@ struct dtv_frontend_properties { * @id: Frontend ID * @exit: Used to inform the DVB core that the frontend * thread should exit (usually, means that the hardware - * got disconnected). - * @remove_mutex: mutex that avoids a race condition between a callback - * called when the hardware is disconnected and the - * file_operations of dvb_frontend. + * got disconnected. */ struct dvb_frontend { @@ -707,7 +704,6 @@ struct dvb_frontend { int (*callback)(void *adapter_priv, int component, int cmd, int arg); int id; unsigned int exit; - struct mutex remove_mutex; }; /** |