lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Browse Source 
Pull power supply fixes from Sebastian Reichel:
 "twl4030-charger fixes"

* tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  twl4030_charger: fix another compile error
  Revert "twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node"
This commit is contained in:
Linus Torvalds
2015-09-17 12:25:42 -07:00
parent d109c4bb45 e11fc21e75
commit 2e5735f4c3
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/power/twl4030_charger.c
View File

@@ -91,7 +91,7 @@
#define TWL4030_MSTATEC_COMPLETE1 0x0b #define TWL4030_MSTATEC_COMPLETE1 0x0b
#define TWL4030_MSTATEC_COMPLETE4 0x0e #define TWL4030_MSTATEC_COMPLETE4 0x0e
#if IS_ENABLED(CONFIG_TWL4030_MADC) #if IS_REACHABLE(CONFIG_TWL4030_MADC)
/* /*
* If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11) * If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
* then AC is available. * then AC is available.
@@ -1057,13 +1057,9 @@ static int twl4030_bci_probe(struct platform_device *pdev)
phynode = of_find_compatible_node(bci->dev->of_node->parent, phynode = of_find_compatible_node(bci->dev->of_node->parent,
NULL, "ti,twl4030-usb"); NULL, "ti,twl4030-usb");
if (phynode) { if (phynode)
bci->transceiver = devm_usb_get_phy_by_node( bci->transceiver = devm_usb_get_phy_by_node(
bci->dev, phynode, &bci->usb_nb); bci->dev, phynode, &bci->usb_nb);
if (IS_ERR(bci->transceiver) &&
PTR_ERR(bci->transceiver) == -EPROBE_DEFER)
return -EPROBE_DEFER;
}
} }
/* Enable interrupts now. */ /* Enable interrupts now. */