Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / usb / phy / phy-twl6030-usb.c

diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c
index 9de7ada90a8b9717d096e3fb9852015dc1199ed4..1753bd367e0ab7aa36b433fc3d77cac2a5b6b9e2 100644 (file)
--- a/drivers/usb/phy/phy-twl6030-usb.c
+++ b/drivers/usb/phy/phy-twl6030-usb.c
@@ -347,7 +347,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)
        if (np) {
                twl->regulator = "usb";
        } else if (pdata) {
-               if (pdata->features & TWL6025_SUBCLASS)
+               if (pdata->features & TWL6032_SUBCLASS)
                        twl->regulator = "ldousb";
                else
                        twl->regulator = "vusb";