2013-10-15 12:31:26

by Charles Keepax

Subject: [PATCH] USB: OHCI: Only use ohci_driver_overrides if they are defined

Overrides are optional and many drivers pass NULL, in this case don't
process the overrides so we don't deference a NULL pointer.

Signed-off-by: Charles Keepax <[email protected]>
---
drivers/usb/host/ohci-hcd.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 21d937a..e26abd5 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1161,6 +1161,9 @@ void ohci_init_driver(struct hc_driver *drv,
/* Copy the generic table to drv and then apply the overrides */
*drv = ohci_hc_driver;

+ if (!over)
+ return;
+
drv->product_desc = over->product_desc;
drv->hcd_priv_size += over->extra_priv_size;
if (over->reset)
--
1.7.2.5

2013-10-15 17:09:07

by Charles Keepax

Subject: Re: [PATCH] USB: OHCI: Only use ohci_driver_overrides if they are defined

Apologies looks like I was on an earlier RC there and the users
that did this have been removed. I assume this patch can be
ignored sorry for the noise.

Thanks,
Charles

2013-10-15 20:13:29

by Alan Stern

Subject: Re: [PATCH] USB: OHCI: Only use ohci_driver_overrides if they are defined

On Tue, 15 Oct 2013, Charles Keepax wrote:

> Apologies looks like I was on an earlier RC there and the users
> that did this have been removed. I assume this patch can be
> ignored sorry for the noise.

Actually it's the other way around. The change you submitted has
already been merged:

https://git.kernel.org/cgit/linux/kernel/git/gregkh/usb.git/commit/drivers/usb/host/ohci-hcd.c?h=usb-next&id=c80ad6d1cd6c6662d0cff752d94a1a9fde6de4ac

Alan Stern