Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[sfrench/cifs-2.6.git] / drivers / rtc / rtc-ac100.c

diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c
index 3fe576fdd45e0782a1ecead2931ddf95d76d8a8d..784b676284bff57d9bb675e0f0f1b7af3113f354 100644 (file)
--- a/drivers/rtc/rtc-ac100.c
+++ b/drivers/rtc/rtc-ac100.c
@@ -317,10 +317,10 @@ static int ac100_rtc_register_clks(struct ac100_rtc_dev *chip)
        const char *parents[2] = {AC100_RTC_32K_NAME};
        int i, ret;
 
-       chip->clk_data = devm_kzalloc(chip->dev, sizeof(*chip->clk_data) +
-                                                sizeof(*chip->clk_data->hws) *
-                                                AC100_CLKOUT_NUM,
-                                                GFP_KERNEL);
+       chip->clk_data = devm_kzalloc(chip->dev,
+                                     struct_size(chip->clk_data, hws,
+                                                 AC100_CLKOUT_NUM),
+                                     GFP_KERNEL);
        if (!chip->clk_data)
                return -ENOMEM;