From: Mateusz Kulikowski Date: Sun, 3 Apr 2016 11:38:26 +0000 (+0200) Subject: usb: ehci-hcd: Fix crash when no ops are provided to ehci_register() X-Git-Tag: v2016.05-rc1~29^2~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cfb3f1cd0e022711d69ff040884357b8410865ef;p=u-boot usb: ehci-hcd: Fix crash when no ops are provided to ehci_register() This commit fixes crash on BananaPi (and possibly others) casued by 3f9f8a5b83f8aec40c9f4ee496046a695e333c45. Crash reason: When no ops were passed to ehci_register(), USB host driver caused NULL pointer dereference. Signed-off-by: Mateusz Kulikowski --- diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 598f444504..fa5d584b82 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -1615,8 +1615,8 @@ int ehci_register(struct udevice *dev, struct ehci_hccr *hccr, if (ret) goto err; - if (ops->init_after_reset) { - ret = ops->init_after_reset(ctrl); + if (ctrl->ops.init_after_reset) { + ret = ctrl->ops.init_after_reset(ctrl); if (ret) goto err; }