diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 17:51:33 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-14 17:51:33 +0200 |
| commit | 85a3685852d9ac7d92be9d824533c915a4597fa4 (patch) | |
| tree | b7c542e2061cf96c9f7ad500fa12567f9ff0b39f /drivers/power/88pm860x_charger.c | |
| parent | Input: alps - non interleaved V2 dualpoint has separate stick button bits (diff) | |
| parent | Input: atkbd - document "no new force-release quirks" policy (diff) | |
| download | linux-85a3685852d9ac7d92be9d824533c915a4597fa4.tar.xz linux-85a3685852d9ac7d92be9d824533c915a4597fa4.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.1 merge window.
Diffstat (limited to 'drivers/power/88pm860x_charger.c')
| -rw-r--r-- | drivers/power/88pm860x_charger.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/88pm860x_charger.c b/drivers/power/88pm860x_charger.c index 650930e4fa79..734ec4afa14d 100644 --- a/drivers/power/88pm860x_charger.c +++ b/drivers/power/88pm860x_charger.c @@ -711,6 +711,7 @@ static int pm860x_charger_probe(struct platform_device *pdev) return 0; out_irq: + power_supply_unregister(&info->usb); while (--i >= 0) free_irq(info->irq[i], info); out: |