From b6d9eb6ad5b919abb04bb02993fc98d277e76021 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Thu, 12 Jul 2012 11:56:54 +0545 Subject: [PATCH] --- yaml --- r: 317980 b: refs/heads/master c: 7fc03add26e1e1f0b375e905547e01da6cdc1599 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gdm72xx/gdm_usb.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2c777f158400..1ac193465563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d67030d215ac1ec13cab16467904c2a7265e1fbd +refs/heads/master: 7fc03add26e1e1f0b375e905547e01da6cdc1599 diff --git a/trunk/drivers/staging/gdm72xx/gdm_usb.c b/trunk/drivers/staging/gdm72xx/gdm_usb.c index 89268c785b25..d48d49c145ee 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_usb.c +++ b/trunk/drivers/staging/gdm72xx/gdm_usb.c @@ -590,20 +590,17 @@ static int gdm_usb_probe(struct usb_interface *intf, goto out; } - phy_dev = kmalloc(sizeof(*phy_dev), GFP_KERNEL); + phy_dev = kzalloc(sizeof(*phy_dev), GFP_KERNEL); if (phy_dev == NULL) { ret = -ENOMEM; goto out; } - udev = kmalloc(sizeof(*udev), GFP_KERNEL); + udev = kzalloc(sizeof(*udev), GFP_KERNEL); if (udev == NULL) { ret = -ENOMEM; goto out; } - memset(phy_dev, 0, sizeof(*phy_dev)); - memset(udev, 0, sizeof(*udev)); - if (idProduct == 0x7205 || idProduct == 0x7206) udev->padding = GDM7205_PADDING; else