Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[cascardo/linux.git] / drivers / staging / android / timed_gpio.c

diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
index bcd9924..914fd10 100644 (file)
--- a/drivers/staging/android/timed_gpio.c
+++ b/drivers/staging/android/timed_gpio.c
@@ -92,9 +92,8 @@ static int timed_gpio_probe(struct platform_device *pdev)
        if (!pdata)
                return -EBUSY;
 
-       gpio_data = devm_kzalloc(&pdev->dev,
-                                sizeof(*gpio_data) * pdata->num_gpios,
-                                GFP_KERNEL);
+       gpio_data = devm_kcalloc(&pdev->dev, pdata->num_gpios,
+                                sizeof(*gpio_data), GFP_KERNEL);
        if (!gpio_data)
                return -ENOMEM;