Commit 313606d9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] dvb: Firmware_class update

From: Michael Hunold <hunold@linuxtv.org>

Use a kernel thread instead of schedule_work() when waiting for the firmware
upload to happen
parent 82b7e321
...@@ -415,18 +415,22 @@ struct firmware_work { ...@@ -415,18 +415,22 @@ struct firmware_work {
void (*cont)(const struct firmware *fw, void *context); void (*cont)(const struct firmware *fw, void *context);
}; };
static void static int
request_firmware_work_func(void *arg) request_firmware_work_func(void *arg)
{ {
struct firmware_work *fw_work = arg; struct firmware_work *fw_work = arg;
const struct firmware *fw; const struct firmware *fw;
if (!arg) if (!arg) {
return; WARN_ON(1);
return 0;
}
daemonize("%s/%s", "firmware", fw_work->name);
request_firmware(&fw, fw_work->name, fw_work->device); request_firmware(&fw, fw_work->name, fw_work->device);
fw_work->cont(fw, fw_work->context); fw_work->cont(fw, fw_work->context);
release_firmware(fw); release_firmware(fw);
module_put(fw_work->module); module_put(fw_work->module);
kfree(fw_work); kfree(fw_work);
return 0;
} }
/** /**
...@@ -451,6 +455,8 @@ request_firmware_nowait( ...@@ -451,6 +455,8 @@ request_firmware_nowait(
{ {
struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work), struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),
GFP_ATOMIC); GFP_ATOMIC);
int ret;
if (!fw_work) if (!fw_work)
return -ENOMEM; return -ENOMEM;
if (!try_module_get(module)) { if (!try_module_get(module)) {
...@@ -465,9 +471,14 @@ request_firmware_nowait( ...@@ -465,9 +471,14 @@ request_firmware_nowait(
.context = context, .context = context,
.cont = cont, .cont = cont,
}; };
INIT_WORK(&fw_work->work, request_firmware_work_func, fw_work);
schedule_work(&fw_work->work); ret = kernel_thread(request_firmware_work_func, fw_work,
CLONE_FS | CLONE_FILES);
if (ret < 0) {
fw_work->cont(NULL, fw_work->context);
return ret;
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment