Skip to content

Commit

Permalink
[PATCH] V4L: Fix crash when not compiled as module
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Reimar Doeffinger authored and Linus Torvalds committed Dec 1, 2005
1 parent 1bcd2a3 commit fd1eab7
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -237,9 +236,7 @@ static void request_module_depend(char *name, int *flag)
}

#else

#define request_module_depend(name,flag)

#endif /* CONFIG_MODULES */

/* ------------------------------------------------------------------ */
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit fd1eab7

Please sign in to comment.