lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (5324): This patch fixes request_module_depend()

Browse Source 
this patch fixes request_module_depend()

Signed-off-by: Markus Rechberger <markus.rechberger@amd.com>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Markus Rechberger
2007-04-27 12:31:17 -03:00
committed by Mauro Carvalho Chehab
parent cfeb88398f
commit 4217e25275
2 changed files with 13 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/media/video/saa7134/saa7134-core.c
View File

@@ -182,55 +182,28 @@ int saa7134_tuner_callback(void *ptr, int command, int arg)
/* delayed request_module */ /* delayed request_module */
#if defined(CONFIG_MODULES) && defined(MODULE) #if defined(CONFIG_MODULES) && defined(MODULE)
static int need_empress;
static int need_dvb;
static int need_alsa;
static int need_oss;
static int pending_call(struct notifier_block *self, unsigned long state,
void *module)
{
if (module != THIS_MODULE || state != MODULE_STATE_LIVE)
return NOTIFY_DONE;
if (need_empress) static void request_module_async(struct work_struct *work){
struct saa7134_dev* dev = container_of(work, struct saa7134_dev, request_module_wk);
if (card_is_empress(dev))
request_module("saa7134-empress"); request_module("saa7134-empress");
if (need_dvb) if (card_is_dvb(dev))
request_module("saa7134-dvb"); request_module("saa7134-dvb");
if (need_alsa) if (alsa)
request_module("saa7134-alsa"); request_module("saa7134-alsa");
if (need_oss) if (oss)
request_module("saa7134-oss"); request_module("saa7134-oss");
return NOTIFY_DONE;
} }
static int pending_registered; static void request_submodules(struct saa7134_dev *dev)
static struct notifier_block pending_notifier = {
.notifier_call = pending_call,
};
static void request_module_depend(char *name, int *flag)
{ {
int err; INIT_WORK(&dev->request_module_wk, request_module_async);
switch (THIS_MODULE->state) { schedule_work(&dev->request_module_wk);
case MODULE_STATE_COMING:
if (!pending_registered) {
err = register_module_notifier(&pending_notifier);
pending_registered = 1;
}
*flag = 1;
break;
case MODULE_STATE_LIVE:
request_module(name);
break;
default:
/* nothing */;
break;
}
} }
#else #else
#define request_module_depend(name,flag) #define request_submodules()
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
@@ -1002,18 +975,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
request_module("tuner"); request_module("tuner");
if (card_is_empress(dev)) { if (card_is_empress(dev)) {
request_module("saa6752hs"); request_module("saa6752hs");
request_module_depend("saa7134-empress",&need_empress);
} }
if (card_is_dvb(dev)) request_submodules(dev);
request_module_depend("saa7134-dvb",&need_dvb);
if (alsa)
request_module_depend("saa7134-alsa",&need_alsa);
if (oss)
request_module_depend("saa7134-oss",&need_oss);
v4l2_prio_init(&dev->prio); v4l2_prio_init(&dev->prio);
@@ -1210,10 +1174,6 @@ static int saa7134_init(void)
static void saa7134_fini(void) static void saa7134_fini(void)
{ {
#if defined(CONFIG_MODULES) && defined(MODULE)
if (pending_registered)
unregister_module_notifier(&pending_notifier);
#endif /* CONFIG_MODULES */
pci_unregister_driver(&saa7134_pci_driver); pci_unregister_driver(&saa7134_pci_driver);
} }

2
drivers/media/video/saa7134/saa7134.h
View File

@@ -437,6 +437,8 @@ struct saa7134_dev {
#ifdef VIDIOC_G_PRIORITY #ifdef VIDIOC_G_PRIORITY
struct v4l2_prio_state prio; struct v4l2_prio_state prio;
#endif #endif
/* workstruct for loading modules */
struct work_struct request_module_wk;
/* insmod option/autodetected */ /* insmod option/autodetected */
int autodetected; int autodetected;