Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / drivers / clk / clk-si5351.c

diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index b051db43fae1995f536bbf732b3a1729a6d214b0..2492442eea77aa0c5abcf540e9bedb81e36d62d3 100644 (file)
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -1354,10 +1354,8 @@ static int si5351_i2c_probe(struct i2c_client *client,
                return -EINVAL;
 
        drvdata = devm_kzalloc(&client->dev, sizeof(*drvdata), GFP_KERNEL);
-       if (drvdata == NULL) {
-               dev_err(&client->dev, "unable to allocate driver data\n");
+       if (!drvdata)
                return -ENOMEM;
-       }
 
        i2c_set_clientdata(client, drvdata);
        drvdata->client = client;
@@ -1535,9 +1533,9 @@ static int si5351_i2c_probe(struct i2c_client *client,
        else
                parent_names[1] = si5351_pll_names[1];
 
-       drvdata->msynth = devm_kzalloc(&client->dev, num_clocks *
+       drvdata->msynth = devm_kcalloc(&client->dev, num_clocks,
                                       sizeof(*drvdata->msynth), GFP_KERNEL);
-       drvdata->clkout = devm_kzalloc(&client->dev, num_clocks *
+       drvdata->clkout = devm_kcalloc(&client->dev, num_clocks,
                                       sizeof(*drvdata->clkout), GFP_KERNEL);
        drvdata->num_clkout = num_clocks;