Merge branch 'master' into next

[sfrench/cifs-2.6.git] / drivers / power / apm_power.c

diff --git a/drivers/power/apm_power.c b/drivers/power/apm_power.c
index a4892275659dc02ffb1d12b85d0774a86bda8b08..936bae560fa1f730255bde8a94c9493c953efdfd 100644 (file)
--- a/drivers/power/apm_power.c
+++ b/drivers/power/apm_power.c
@@ -78,7 +78,7 @@ static void find_main_battery(void)
        main_battery = NULL;
        bp.main = main_battery;
 
-       error = class_for_each_device(power_supply_class, &bp,
+       error = class_for_each_device(power_supply_class, NULL, &bp,
                                      __find_main_battery);
        if (error) {
                main_battery = bp.main;