From fc7869a156c04f2671275c17777d066ab27e2bd6 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 7 Mar 2019 00:00:11 -0800 Subject: usb: storage: Simplify memory allocation in usb_stor_probe() Replace explicit malloc() + OOM check and memset() with a single call to xzalloc(). Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- drivers/usb/storage/usb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 8218bb2a71..d25e19473f 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -541,10 +541,7 @@ static int usb_stor_probe(struct usb_device *usbdev, US_DEBUGP("Selected interface %d\n", (int)intf->desc.bInterfaceNumber); /* allocate us_data structure */ - us = (struct us_data *)malloc(sizeof(struct us_data)); - if (!us) - return -ENOMEM; - memset(us, 0, sizeof(struct us_data)); + us = xzalloc(sizeof(*us)); /* initialize the us_data structure */ us->pusb_dev = usbdev; -- cgit v1.2.3