Skip to content

Commit

Permalink
power: supply: cpcap: Add missing IRQF_ONESHOT to fix regression
Browse files Browse the repository at this point in the history
Commit 25d76fe ("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: 25d76fe ("phy: cpcap-usb: Use IRQF_ONESHOT")
Reported-by: Merlijn Wajer <merlijn@wizzup.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  • Loading branch information
Tony Lindgren authored and Sebastian Reichel committed Jan 2, 2021
1 parent 1e625fe commit e62333e
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/power/supply/cpcap-battery.c
Original file line number Diff line number Diff line change
@@ -673,7 +673,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",
2 changes: 1 addition & 1 deletion drivers/power/supply/cpcap-charger.c
Original file line number Diff line number Diff line change
@@ -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",

0 comments on commit e62333e

Please sign in to comment.