Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / power / ab8500_charger.c

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index fd350189b6329baaf3a6808462eb1b479394c979..8c8d170ff0f86533c01d560791f84e7b6bdd2010 100644 (file)
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -766,7 +766,6 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
                        ret = -ENXIO;
                        break;
                }
-               break;
        case USB_STAT_CARKIT_1:
        case USB_STAT_CARKIT_2:
        case USB_STAT_ACA_DOCK_CHARGER:
@@ -3734,7 +3733,6 @@ static struct platform_driver ab8500_charger_driver = {
        .resume = ab8500_charger_resume,
        .driver = {
                .name = "ab8500-charger",
-               .owner = THIS_MODULE,
                .of_match_table = ab8500_charger_match,
        },
 };