summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2015-09-07 21:30:25 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 10:47:19 +0100
commit9766f2517e55338ab546891c4bfff6666ffacaea (patch)
tree5c03479d361e2003dbb2d48955bd12a711bae8a3 /drivers/usb/core
parent776c15d0ad0c7534be4e7a1b980ee933ef7c4387 (diff)
downloadop-kernel-dev-9766f2517e55338ab546891c4bfff6666ffacaea.zip
op-kernel-dev-9766f2517e55338ab546891c4bfff6666ffacaea.tar.gz
usb: core: driver: Use kmalloc_array
Use kmalloc_array instead of kmalloc to allocate memory for an array. Also, remove the dev_warn for a memory leak, making the if check more sleek. Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/driver.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 047f9f9..56593a9 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -421,12 +421,10 @@ static int usb_unbind_interface(struct device *dev)
if (ep->streams == 0)
continue;
if (j == 0) {
- eps = kmalloc(USB_MAXENDPOINTS * sizeof(void *),
+ eps = kmalloc_array(USB_MAXENDPOINTS, sizeof(void *),
GFP_KERNEL);
- if (!eps) {
- dev_warn(dev, "oom, leaking streams\n");
+ if (!eps)
break;
- }
}
eps[j++] = ep;
}
OpenPOWER on IntegriCloud