浏览代码

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

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>
Reimar Doeffinger 19 年之前
父节点
当前提交
fd1eab73d5
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3 6
      drivers/media/video/saa7134/saa7134-core.c

+ 3 - 6
drivers/media/video/saa7134/saa7134-core.c

@@ -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)
 }
 }
 
 
 #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)
 
 
 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);
 }
 }