Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2548c06b authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Len Brown
Browse files

ACPI: dock: Fix symbol conflict between acpiphp and dock 



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

Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c80fdbe8

drivers/acpi/dock.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

}