From ff66a057b8b67749b41fc0ce0298c367952a27fc Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Tue, 20 Dec 2005 17:10:17 +0000 Subject: Fix saa7134 ALSA/OSS collisions From: Ricardo Cerqueira When ALSA or OSS are loaded, check if the other is present Fixed hotplug notifiers cleanup on module removal Signed-off-by: --- v4l/ChangeLog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'v4l') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 8a36c23e7..fb2559e8a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2005-12-20 17:05 rmcc + + * linux/drivers/media/video/saa7134/saa7134-alsa.c: + (saa7134_alsa_init), (saa7134_alsa_exit): + * linux/drivers/media/video/saa7134/saa7134-oss.c: + (saa7134_oss_init), (saa7134_oss_exit): + + - Fixed the saa7134 hotplug notifiers to prevent collisions between + ALSA and OSS + - Prevent ALSA or OSS from loading if the other is present. + + Signed-off-by: Ricardo Cerqueira + 2005-12-20 15:54 mkrufky * linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c: -- cgit v1.2.3