projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
usb
/
misc
/
brcmstb-usb-pinmap.c
diff --git
a/drivers/usb/misc/brcmstb-usb-pinmap.c
b/drivers/usb/misc/brcmstb-usb-pinmap.c
index
b3cfe86
..
3366530
100644
(file)
--- a/
drivers/usb/misc/brcmstb-usb-pinmap.c
+++ b/
drivers/usb/misc/brcmstb-usb-pinmap.c
@@
-263,6
+263,8
@@
static int __init brcmstb_usb_pinmap_probe(struct platform_device *pdev)
return -EINVAL;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
return -EINVAL;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!r)
+ return -EINVAL;
pdata = devm_kzalloc(&pdev->dev,
sizeof(*pdata) +
pdata = devm_kzalloc(&pdev->dev,
sizeof(*pdata) +