Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4217e25275eeb1973ca5bed65645f70b8f6c199d
Commit: 4217e25275eeb1973ca5bed65645f70b8f6c199d
Parent: cfeb88398f004a0e85ee011fd89a01f5d3bf3c81
Author: Markus Rechberger <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 27 12:31:17 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:43:41 2007 -0300
V4L/DVB (5324): This patch fixes request_module_depend()
this patch fixes request_module_depend()
Signed-off-by: Markus Rechberger <[EMAIL PROTECTED]>
Signed-off-by: Hartmut Hackmann <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/video/saa7134/saa7134-core.c | 62 +++++-----------------------
drivers/media/video/saa7134/saa7134.h | 2 +
2 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/drivers/media/video/saa7134/saa7134-core.c
b/drivers/media/video/saa7134/saa7134-core.c
index 5f74ea4..f05b0a9 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -182,55 +182,28 @@ int saa7134_tuner_callback(void *ptr, int command, int
arg)
/* delayed request_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");
- if (need_dvb)
+ if (card_is_dvb(dev))
request_module("saa7134-dvb");
- if (need_alsa)
+ if (alsa)
request_module("saa7134-alsa");
- if (need_oss)
+ if (oss)
request_module("saa7134-oss");
- return NOTIFY_DONE;
}
-static int pending_registered;
-static struct notifier_block pending_notifier = {
- .notifier_call = pending_call,
-};
-
-static void request_module_depend(char *name, int *flag)
+static void request_submodules(struct saa7134_dev *dev)
{
- int err;
- switch (THIS_MODULE->state) {
- 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;
- }
+ INIT_WORK(&dev->request_module_wk, request_module_async);
+ schedule_work(&dev->request_module_wk);
}
#else
-#define request_module_depend(name,flag)
+#define request_submodules()
#endif /* CONFIG_MODULES */
/* ------------------------------------------------------------------ */
@@ -1002,18 +975,9 @@ static int __devinit saa7134_initdev(struct pci_dev
*pci_dev,
request_module("tuner");
if (card_is_empress(dev)) {
request_module("saa6752hs");
- request_module_depend("saa7134-empress",&need_empress);
}
- if (card_is_dvb(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);
+ request_submodules(dev);
v4l2_prio_init(&dev->prio);
@@ -1210,10 +1174,6 @@ static int saa7134_init(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);
}
diff --git a/drivers/media/video/saa7134/saa7134.h
b/drivers/media/video/saa7134/saa7134.h
index c365ec5..6aeba14 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -437,6 +437,8 @@ struct saa7134_dev {
#ifdef VIDIOC_G_PRIORITY
struct v4l2_prio_state prio;
#endif
+ /* workstruct for loading modules */
+ struct work_struct request_module_wk;
/* insmod option/autodetected */
int autodetected;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
