diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 11 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 985a053ab..67ba9f990 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.56 2005/11/16 03:34:21 rmcc Exp $ + * $Id: saa7134-core.c,v 1.57 2005/11/24 21:51:41 nsh Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -247,7 +247,7 @@ static void dump_statusregs(struct saa7134_dev *dev) /* ----------------------------------------------------------- */ /* delayed request_module */ -#ifdef CONFIG_MODULES +#if defined(CONFIG_MODULES) && defined(MODULE) static int need_empress; static int need_dvb; static int need_alsa; @@ -257,7 +257,6 @@ static int pending_registered=0; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #define request_module_depend(name,flag) request_module(name); #else - static int pending_call(struct notifier_block *self, unsigned long state, void *module) { @@ -301,9 +300,7 @@ static void request_module_depend(char *name, int *flag) #endif #else - #define request_module_depend(name,flag) - #endif /* CONFIG_MODULES */ /* ------------------------------------------------------------------ */ @@ -1236,12 +1233,12 @@ static int saa7134_init(void) static void saa7134_fini(void) { -#ifdef CONFIG_MODULES +#if defined(CONFIG_MODULES) && defined(MODULE) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) if (pending_registered) unregister_module_notifier(&pending_notifier); #endif -#endif +#endif /* CONFIG_MODULES */ pci_unregister_driver(&saa7134_pci_driver); } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1836b70f9..63efa4290 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-11-24 21:49 nshmyrev + + * ../linux/drivers/media/video/saa7134/saa7134-core.c: + (saa7134_fini): + + Fix crash when not compiled as module. + + Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-11-24 21:38 mkrufky * ../v4l/Make.config: |