From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753431AbbIGP6X (ORCPT ); Mon, 7 Sep 2015 11:58:23 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33377 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751331AbbIGP6T (ORCPT ); Mon, 7 Sep 2015 11:58:19 -0400 From: Muhammad Falak R Wani To: Greg Korah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Joe Perches , Muhammad Falak R Wani Subject: [PATCH v1] usb: core: driver: Use kmalloc_array Date: Mon, 7 Sep 2015 21:30:25 +0530 Message-Id: <1441641625-6302-1-git-send-email-falakreyaz@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- On suggestion by Joe Perches Changes since v0 -remove dev_warn for memory leak -remove unnecessary parens for if --- 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 818369a..e0636c1 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -416,12 +416,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; } -- 1.9.1