redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] V4L: Fix crash when not compiled as module

Browse source 
Fix crash when not compiled as module.

Signed-off-by: Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Reimar Doeffinger 2005-12-01 00:51:39 -08:00 committed by Linus Torvalds
parent 1bcd2a3671
commit fd1eab73d5
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/video/saa7134/saa7134-core.c
View file

@ -187,8 +187,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
/* ----------------------------------------------------------- */
/* delayed request_module */
#ifdef CONFIG_MODULES
#if defined(CONFIG_MODULES) && defined(MODULE)
static int need_empress;
static int need_dvb;
static int need_alsa;
@ -237,9 +236,7 @@ static void request_module_depend(char *name, int *flag)
}
#else
#define request_module_depend(name,flag)
#endif /* CONFIG_MODULES */
/* ------------------------------------------------------------------ */
@ -1163,10 +1160,10 @@ static int saa7134_init(void)
static void saa7134_fini(void)
{
#ifdef CONFIG_MODULES
#if defined(CONFIG_MODULES) && defined(MODULE)
if (pending_registered)
unregister_module_notifier(&pending_notifier);
#endif
#endif /* CONFIG_MODULES */
pci_unregister_driver(&saa7134_pci_driver);
}