diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-09 10:35:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-09 10:35:13 +0100 |
| commit | 57cde551225bb09fa40ca3938e06d59fc529ff90 (patch) | |
| tree | 1c39f6262c41565add24374503a1c1ffe4bc12d3 /drivers/usb/misc | |
| parent | usb: misc: brcmstb-usb-pinmap: Make sync_all_pins static (diff) | |
| parent | Linux 5.10-rc3 (diff) | |
| download | linux-57cde551225bb09fa40ca3938e06d59fc529ff90.tar.xz linux-57cde551225bb09fa40ca3938e06d59fc529ff90.zip | |
Merge 5.10-rc3 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
| -rw-r--r-- | drivers/usb/misc/apple-mfi-fastcharge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/misc/apple-mfi-fastcharge.c b/drivers/usb/misc/apple-mfi-fastcharge.c index 579d8c84de42..9de0171b5177 100644 --- a/drivers/usb/misc/apple-mfi-fastcharge.c +++ b/drivers/usb/misc/apple-mfi-fastcharge.c @@ -120,8 +120,10 @@ static int apple_mfi_fc_set_property(struct power_supply *psy, dev_dbg(&mfi->udev->dev, "prop: %d\n", psp); ret = pm_runtime_get_sync(&mfi->udev->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(&mfi->udev->dev); return ret; + } switch (psp) { case POWER_SUPPLY_PROP_CHARGE_TYPE: |