Skip to content

Commit

Permalink
Merge pull request #175 from kholk/aosp/AU_LINUX_ANDROID_LA.BF.2.1_RB…
Browse files Browse the repository at this point in the history
…1.05.00.00.173.012

drivers: power: qpnp-charger: Cleanup ifdef for Yukon, use API
  • Loading branch information
Alin Jerpelea committed Feb 19, 2015
2 parents f1ae79e + 1b6fb4a commit 38af0af
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/power/qpnp-charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -6595,14 +6595,14 @@ qpnp_charger_probe(struct spmi_device *spmi)
goto fail_chg_enable;
}

#ifndef CONFIG_MACH_SONY_YUKON
chip->ext_vbus_psy = power_supply_get_by_name("ext-vbus");
if (!chip->ext_vbus_psy) {
pr_err("ext-vbus supply not found deferring probe\n");
rc = -EPROBE_DEFER;
goto fail_chg_enable;
if (!of_machine_is_compatible("qcom,msm8926")) {
chip->ext_vbus_psy = power_supply_get_by_name("ext-vbus");
if (!chip->ext_vbus_psy) {
pr_err("ext-vbus supply not found deferring probe\n");
rc = -EPROBE_DEFER;
goto fail_chg_enable;
}
}
#endif

mutex_init(&chip->jeita_configure_lock);
mutex_init(&chip->batfet_vreg_lock);
Expand Down

0 comments on commit 38af0af

Please sign in to comment.