Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752957AbcKSLJD (ORCPT ); Sat, 19 Nov 2016 06:09:03 -0500 Received: from smtp08.smtpout.orange.fr ([80.12.242.130]:31425 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752496AbcKSLJA (ORCPT ); Sat, 19 Nov 2016 06:09:00 -0500 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 19 Nov 2016 12:08:58 +0100 X-ME-IP: 92.140.172.136 From: Christophe JAILLET To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, eraretuya@gmail.com Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] staging: iio: ad9832: Date: Sat, 19 Nov 2016 12:08:34 +0100 Message-Id: <20161119110834.25025-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.9.3 X-Antivirus: avast! (VPS 161118-2, 18/11/2016), Outbound message X-Antivirus-Status: Clean Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1788 Lines: 56 Commit a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") and commit 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") add some dereference of 'st' which is an un-initialized pointer at this point. Re-order code and tweak error handling in order to allocate memory and have 'st' be a valid pointer before using it. Fixes: a98461d79ba5 ("staging: iio: ad9832: add DVDD regulator") Fixes: 43a07e48af44 ("staging: iio: ad9832: clean-up regulator 'reg'") Signed-off-by: Christophe JAILLET --- Compile tested only --- drivers/staging/iio/frequency/ad9832.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c index 639047fade30..16894836f982 100644 --- a/drivers/staging/iio/frequency/ad9832.c +++ b/drivers/staging/iio/frequency/ad9832.c @@ -211,6 +211,15 @@ static int ad9832_probe(struct spi_device *spi) return -ENODEV; } + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); + if (!indio_dev) + return -ENOMEM; + + spi_set_drvdata(spi, indio_dev); + st = iio_priv(indio_dev); + st->mclk = pdata->mclk; + st->spi = spi; + st->avdd = devm_regulator_get(&spi->dev, "avdd"); if (IS_ERR(st->avdd)) return PTR_ERR(st->avdd); @@ -233,16 +242,6 @@ static int ad9832_probe(struct spi_device *spi) goto error_disable_avdd; } - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); - if (!indio_dev) { - ret = -ENOMEM; - goto error_disable_dvdd; - } - spi_set_drvdata(spi, indio_dev); - st = iio_priv(indio_dev); - st->mclk = pdata->mclk; - st->spi = spi; - indio_dev->dev.parent = &spi->dev; indio_dev->name = spi_get_device_id(spi)->name; indio_dev->info = &ad9832_info; -- 2.9.3