Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c2025b4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Felipe Balbi
Browse files

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: a2fd2423 ("usb: phy: omap-otg: Replace deprecated API of extcon")
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 705e63d2

drivers/usb/phy/phy-omap-otg.c

+1 −1
Original line number Diff line number Diff line
@@ -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;