From 9766f2517e55338ab546891c4bfff6666ffacaea Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Mon, 7 Sep 2015 21:30:25 +0530 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 047f9f94d72d..56593a9a8726 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; } -- 2.34.1