Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / staging / gdm72xx / gdm_sdio.c

diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
index 5e19b09e3bfff35dbc873f9e1eab9b0489fb2e0b..3e43c012ef27a838447b8f11ac8c1d7e90783f22 100644 (file)
--- a/drivers/staging/gdm72xx/gdm_sdio.c
+++ b/drivers/staging/gdm72xx/gdm_sdio.c
@@ -664,20 +664,17 @@ static int sdio_wimax_probe(struct sdio_func *func,
        if (ret)
                return ret;
 
-       phy_dev = kmalloc(sizeof(*phy_dev), GFP_KERNEL);
+       phy_dev = kzalloc(sizeof(*phy_dev), GFP_KERNEL);
        if (phy_dev == NULL) {
                ret = -ENOMEM;
                goto out;
        }
-       sdev = kmalloc(sizeof(*sdev), GFP_KERNEL);
+       sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);
        if (sdev == NULL) {
                ret = -ENOMEM;
                goto out;
        }
 
-       memset(phy_dev, 0, sizeof(*phy_dev));
-       memset(sdev, 0, sizeof(*sdev));
-
        phy_dev->priv_dev = (void *)sdev;
        phy_dev->send_func = gdm_sdio_send;
        phy_dev->rcv_func = gdm_sdio_receive;