Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: dock: Fix symbol conflict between acpiphp and dock

Browse Source 
Fix bug which will cause acpiphp to not be able to load when dock.ko
cannot load.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Prarit Bhargava 2006-12-04 14:50:17 -08:00 committed by Len Brown
parent c80fdbe81a
commit 2548c06b72
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/dock.c
View File

@ -444,6 +444,9 @@ static int dock_in_progress(struct dock_station *ds)
*/
int register_dock_notifier(struct notifier_block *nb)
{
if (!dock_station)
return -ENODEV;
return atomic_notifier_chain_register(&dock_notifier_list, nb);
}
@ -455,6 +458,9 @@ EXPORT_SYMBOL_GPL(register_dock_notifier);
*/
void unregister_dock_notifier(struct notifier_block *nb)
{
if (!dock_station)
return;
atomic_notifier_chain_unregister(&dock_notifier_list, nb);
}
@ -807,7 +813,7 @@ static int __init dock_init(void)
ACPI_UINT32_MAX, find_dock, &num, NULL);
if (!num)
return -ENODEV;
printk(KERN_INFO "No dock devices found.\n");
return 0;
}