diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2013-01-08 22:11:14 +0300 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-01-17 15:45:45 +0200 |
commit | b37457d80bc3e2a6bb86a6036c572574614a7631 (patch) | |
tree | 195e5c175921562c353107d93ece3fb7ce042f56 | |
parent | 25736e0c8269e9613aa6036fbc591818daa30d14 (diff) | |
download | blackbird-op-linux-b37457d80bc3e2a6bb86a6036c572574614a7631.tar.gz blackbird-op-linux-b37457d80bc3e2a6bb86a6036c572574614a7631.zip |
usb: musb: omap2430: fix wrong devm_kzalloc() result check
Commit 00a0b1d58af873d842580dcac55f3b156c3a4077 (usb: musb: omap: Add device
tree support for omap musb glue) assigns result of devm_kzalloc() call to
the 'config' variable but then checks for NULL the 'data' variable (already
checked after previous call). Thus we risk a kernel oops further when data
pointed by 'config' is written to by subsequent of_property_read_u32() calls
iff the allocation happens to fail...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/musb/omap2430.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index b15bb05dc5e8..bb48796e5213 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -543,7 +543,7 @@ static int omap2430_probe(struct platform_device *pdev) } config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL); - if (!data) { + if (!config) { dev_err(&pdev->dev, "failed to allocate musb hdrc config\n"); goto err2; |