Commit fd1eab73 authored by Reimar Doeffinger's avatar Reimar Doeffinger Committed by Linus Torvalds

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

Fix crash when not compiled as module.
Signed-off-by: default avatarReimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1bcd2a36
...@@ -187,8 +187,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) ...@@ -187,8 +187,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg)
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* delayed request_module */ /* delayed request_module */
#ifdef CONFIG_MODULES #if defined(CONFIG_MODULES) && defined(MODULE)
static int need_empress; static int need_empress;
static int need_dvb; static int need_dvb;
static int need_alsa; static int need_alsa;
...@@ -237,9 +236,7 @@ static void request_module_depend(char *name, int *flag) ...@@ -237,9 +236,7 @@ static void request_module_depend(char *name, int *flag)
} }
#else #else
#define request_module_depend(name,flag) #define request_module_depend(name,flag)
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
...@@ -1163,10 +1160,10 @@ static int saa7134_init(void) ...@@ -1163,10 +1160,10 @@ static int saa7134_init(void)
static void saa7134_fini(void) static void saa7134_fini(void)
{ {
#ifdef CONFIG_MODULES #if defined(CONFIG_MODULES) && defined(MODULE)
if (pending_registered) if (pending_registered)
unregister_module_notifier(&pending_notifier); unregister_module_notifier(&pending_notifier);
#endif #endif /* CONFIG_MODULES */
pci_unregister_driver(&saa7134_pci_driver); pci_unregister_driver(&saa7134_pci_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment