diff options
author | Erik Ekman <erik@kryo.se> | 2009-04-02 19:57:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-02 22:04:52 -0400 |
commit | b277c884f7856ce0791b1e72079023a86767981b (patch) | |
tree | 583eee77a6ebc27efb8cd4e01fd21befcc27ffa0 /drivers/pnp | |
parent | 8c655918b15691d3a97f4e9a7c3c0a6ac992e297 (diff) |
pnpbios: propagate kthread_run() error
- Error code from kthread_run() is now returned in pnpbios_thread_init()
- Remove variable which always was 0.
Signed-off-by: Erik Ekman <erik@kryo.se>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/pnpbios/core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index e706d22b6dd1..cfe86853feb2 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c | |||
@@ -94,7 +94,6 @@ struct pnp_dev_node_info node_info; | |||
94 | 94 | ||
95 | #ifdef CONFIG_HOTPLUG | 95 | #ifdef CONFIG_HOTPLUG |
96 | 96 | ||
97 | static int unloading = 0; | ||
98 | static struct completion unload_sem; | 97 | static struct completion unload_sem; |
99 | 98 | ||
100 | /* | 99 | /* |
@@ -158,7 +157,7 @@ static int pnp_dock_thread(void *unused) | |||
158 | int docked = -1, d = 0; | 157 | int docked = -1, d = 0; |
159 | 158 | ||
160 | set_freezable(); | 159 | set_freezable(); |
161 | while (!unloading) { | 160 | while (1) { |
162 | int status; | 161 | int status; |
163 | 162 | ||
164 | /* | 163 | /* |
@@ -586,8 +585,8 @@ static int __init pnpbios_thread_init(void) | |||
586 | struct task_struct *task; | 585 | struct task_struct *task; |
587 | init_completion(&unload_sem); | 586 | init_completion(&unload_sem); |
588 | task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd"); | 587 | task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd"); |
589 | if (!IS_ERR(task)) | 588 | if (IS_ERR(task)) |
590 | unloading = 0; | 589 | return PTR_ERR(task); |
591 | } | 590 | } |
592 | #endif | 591 | #endif |
593 | return 0; | 592 | return 0; |