Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1665625

[PATCH v6 3/4] power: supply: twl4030-charger: move irq allocation to just before irqs are enabled

Show all headers | View raw

This avoids a potential race if irqs are enabled and triggered too early
before the worker is properly set up.

Suggested-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
 drivers/power/supply/twl4030_charger.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 1fbbe0cc216a..3bebeecb4a1f 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -984,6 +984,16 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, bci);
 
+	if (bci->dev->of_node) {
+		struct device_node *phynode;
+
+		phynode = of_find_compatible_node(bci->dev->of_node->parent,
+						  NULL, "ti,twl4030-usb");
+		if (phynode)
+			bci->transceiver = devm_usb_get_phy_by_node(
+				bci->dev, phynode, &bci->usb_nb);
+	}
+
 	bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
 	if (IS_ERR(bci->channel_vac)) {
 		bci->channel_vac = NULL;
@@ -1006,6 +1016,10 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	INIT_WORK(&bci->work, twl4030_bci_usb_work);
+	INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker);
+
+	bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
 	ret = devm_request_threaded_irq(&pdev->dev, bci->irq_chg, NULL,
 			twl4030_charger_interrupt, IRQF_ONESHOT, pdev->name,
 			bci);
@@ -1023,20 +1037,6 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	INIT_WORK(&bci->work, twl4030_bci_usb_work);
-	INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker);
-
-	bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
-	if (bci->dev->of_node) {
-		struct device_node *phynode;
-
-		phynode = of_find_compatible_node(bci->dev->of_node->parent,
-						  NULL, "ti,twl4030-usb");
-		if (phynode)
-			bci->transceiver = devm_usb_get_phy_by_node(
-				bci->dev, phynode, &bci->usb_nb);
-	}
-
 	/* Enable interrupts now. */
 	reg = ~(u32)(TWL4030_ICHGLOW | TWL4030_ICHGEOC | TWL4030_TBATOR2 |
 		TWL4030_TBATOR1 | TWL4030_BATSTS);
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 0/4] More fixes for twl4030 charger "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
  [PATCH v6 2/4] power: supply: twl4030-charger: move allocation of iio channel to the beginning "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
    Re: [PATCH v6 2/4] power: supply: twl4030-charger: move allocation  of iio channel to the beginning Sebastian Reichel <sre@kernel.org> - 2017-06-14 22:20 +0200
  [PATCH v6 1/4] power: supply: twl4030-charger: allocate iio by devm_iio_channel_get() and fix error path "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
    Re: [PATCH v6 1/4] power: supply: twl4030-charger: allocate iio by  devm_iio_channel_get() and fix error path Sebastian Reichel <sre@kernel.org> - 2017-06-14 22:20 +0200
  [PATCH v6 3/4] power: supply: twl4030-charger: move irq allocation to just before irqs are enabled "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:30 +0200
    Re: [PATCH v6 3/4] power: supply: twl4030-charger: move irq  allocation to just before irqs are enabled Sebastian Reichel <sebastian.reichel@collabora.co.uk> - 2017-06-15 13:50 +0200
  Re: [PATCH v6 0/4] More fixes for twl4030 charger "H. Nikolaus Schaller" <hns@goldelico.com> - 2017-06-14 11:40 +0200

csiph-web