Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139639
b: refs/heads/master
c: 8c65591
h: refs/heads/master
i:
  139637: 9482f84
  139635: 89d3505
  139631: a60d8f8
v: v3
  • Loading branch information
Erik Ekman authored and Linus Torvalds committed Apr 3, 2009
1 parent 9ca143c commit 1ed4a47
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bfb9bcdbda9a61bca469bf899a589918c60c4c18
refs/heads/master: 8c655918b15691d3a97f4e9a7c3c0a6ac992e297
13 changes: 7 additions & 6 deletions trunk/drivers/pnp/pnpbios/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -575,19 +575,20 @@ fs_initcall(pnpbios_init);

static int __init pnpbios_thread_init(void)
{
struct task_struct *task;

#if defined(CONFIG_PPC)
if (check_legacy_ioport(PNPBIOS_BASE))
return 0;
#endif
if (pnpbios_disabled)
return 0;
#ifdef CONFIG_HOTPLUG
init_completion(&unload_sem);
task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
if (!IS_ERR(task))
unloading = 0;
{
struct task_struct *task;
init_completion(&unload_sem);
task = kthread_run(pnp_dock_thread, NULL, "kpnpbiosd");
if (!IS_ERR(task))
unloading = 0;
}
#endif
return 0;
}
Expand Down

0 comments on commit 1ed4a47

Please sign in to comment.