Skip to contentSkip to conversation

power: supply: cpcap: Add missing IRQF_ONESHOT to fix regression

PATCH In review Tony Lindgren 2 participants 2 messages Dec 30, 2020 – Jan 3, 2021 Power supply

lore
Share & tools
lore

Tony Lindgren

author
#0 lore raw

PATCH 1/1 power: supply: cpcap: Add missing IRQF_ONESHOT to fix regression

Commit 25d76fed7ffe ("phy: cpcap-usb: Use IRQF_ONESHOT") started causing errors loading phy-cpcap-usb driver:

cpcap_battery cpcap_battery.0: failed to register power supply
genirq: Flags mismatch irq 211. 00002080 (se0conn) vs. 00000080 (se0conn) cpcap-usb-phy cpcap-usb-phy.0: could not get irq se0conn: -16

Let's fix this by adding the missing IRQF_ONESHOT to also cpcap-battery and cpcap-charger drivers.

Fixes 25d76fed7ffe ("phy: cpcap-usb: Use IRQF_ONESHOT")
Reported-by Merlijn Wajer <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 drivers/power/supply/cpcap-battery.c | 2 +-
 drivers/power/supply/cpcap-charger.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/supply/cpcap-battery.c +1 -1
@@ -666,7 +666,7 @@ static int cpcap_battery_init_irq(struct platform_device *pdev,
 
 	error = devm_request_threaded_irq(ddata->dev, irq, NULL,
 					  cpcap_battery_irq_thread,
-					  IRQF_SHARED,
+					  IRQF_SHARED | IRQF_ONESHOT,
 					  name, ddata);
 	if (error) {
 		dev_err(ddata->dev, "could not get irq %s: %i\n",
drivers/power/supply/cpcap-charger.c +1 -1
@@ -708,7 +708,7 @@ static int cpcap_usb_init_irq(struct platform_device *pdev,
 
 	error = devm_request_threaded_irq(ddata->dev, irq, NULL,
 					  cpcap_charger_irq_thread,
-					  IRQF_SHARED,
+					  IRQF_SHARED | IRQF_ONESHOT,
 					  name, ddata);
 	if (error) {
 		dev_err(ddata->dev, "could not get irq %s: %i\n",
Signature · 1 line
2.29.2
#1 lore raw

Hi Tony,

Quoted 7 lines · Tony Lindgren

Commit 25d76fed7ffe ("phy: cpcap-usb: Use IRQF_ONESHOT") started causing errors loading phy-cpcap-usb driver:

cpcap_battery cpcap_battery.0: failed to register power supply
genirq: Flags mismatch irq 211. 00002080 (se0conn) vs. 00000080 (se0conn) cpcap-usb-phy cpcap-usb-phy.0: could not get irq se0conn: -16

Quoted 7 lines

Let's fix this by adding the missing IRQF_ONESHOT to also cpcap-battery and cpcap-charger drivers.

Fixes 25d76fed7ffe ("phy: cpcap-usb: Use IRQF_ONESHOT")
Reported-by Merlijn Wajer <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

---

Thanks, queued.

-- Sebastian

Quoted 30 lines
 drivers/power/supply/cpcap-battery.c | 2 +-
 drivers/power/supply/cpcap-charger.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/power/supply/cpcap-battery.c +1 -1
@@ -666,7 +666,7 @@ static int cpcap_battery_init_irq(struct platform_device *pdev,
 
 	error = devm_request_threaded_irq(ddata->dev, irq, NULL,
 					  cpcap_battery_irq_thread,
-					  IRQF_SHARED,
+					  IRQF_SHARED | IRQF_ONESHOT,
 					  name, ddata);
 	if (error) {
 		dev_err(ddata->dev, "could not get irq %s: %i\n",
drivers/power/supply/cpcap-charger.c +1 -1
@@ -708,7 +708,7 @@ static int cpcap_usb_init_irq(struct platform_device *pdev,
 
 	error = devm_request_threaded_irq(ddata->dev, irq, NULL,
 					  cpcap_charger_irq_thread,
-					  IRQF_SHARED,
+					  IRQF_SHARED | IRQF_ONESHOT,
 					  name, ddata);
 	if (error) {
 		dev_err(ddata->dev, "could not get irq %s: %i\n",
Signature · 1 line
2.29.2