diff options
| author | Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2016-04-03 13:38:26 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2016-04-10 17:18:42 +0200 |
| commit | cfb3f1cd0e022711d69ff040884357b8410865ef (patch) | |
| tree | 5d04158fb6fe363c48095c659a0d74f659268cc4 /drivers/usb | |
| parent | ac7eef716e6298feea81a927904b25efe1f492ac (diff) | |
| download | talos-obmc-uboot-cfb3f1cd0e022711d69ff040884357b8410865ef.tar.gz talos-obmc-uboot-cfb3f1cd0e022711d69ff040884357b8410865ef.zip | |
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 <mateusz.kulikowski@gmail.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |
