diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-10-27 22:26:33 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-11-16 17:17:40 +0100 |
| commit | 2c2025b41aeff57963f9ae2dd909fea704c625ab (patch) | |
| tree | 5404703d8005cffcc683d8a2171ecec40fe0dad6 /drivers/usb/phy/phy-omap-otg.c | |
| parent | usb: musb: core: fix order of arguments to ulpi write callback (diff) | |
| download | linux-2c2025b41aeff57963f9ae2dd909fea704c625ab.tar.xz linux-2c2025b41aeff57963f9ae2dd909fea704c625ab.zip | |
usb: phy: omap-otg: fix uninitialized pointer
otg_dev->extcon was referenced before otg_dev was initialized. Fix.
Cc: <stable@vger.kernel.org> # v4.3
Fixes: a2fd2423240f ("usb: phy: omap-otg: Replace deprecated API of extcon")
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/phy/phy-omap-otg.c')
| -rw-r--r-- | drivers/usb/phy/phy-omap-otg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-omap-otg.c b/drivers/usb/phy/phy-omap-otg.c index 1270906ccb95..c4bf2de6d14e 100644 --- a/drivers/usb/phy/phy-omap-otg.c +++ b/drivers/usb/phy/phy-omap-otg.c @@ -105,7 +105,6 @@ static int omap_otg_probe(struct platform_device *pdev) extcon = extcon_get_extcon_dev(config->extcon); if (!extcon) return -EPROBE_DEFER; - otg_dev->extcon = extcon; otg_dev = devm_kzalloc(&pdev->dev, sizeof(*otg_dev), GFP_KERNEL); if (!otg_dev) @@ -115,6 +114,7 @@ static int omap_otg_probe(struct platform_device *pdev) if (IS_ERR(otg_dev->base)) return PTR_ERR(otg_dev->base); + otg_dev->extcon = extcon; otg_dev->id_nb.notifier_call = omap_otg_id_notifier; otg_dev->vbus_nb.notifier_call = omap_otg_vbus_notifier; |