diff options
| author | Greg Kroah-Hartman | 2013-10-19 22:14:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-10-19 22:14:34 +0200 |
| commit | f7a0fd56e4f58aec3300082fc10433052e2f1863 (patch) | |
| tree | 4b3348f4866f6b3417f456a298229d63d4581424 /drivers/iio/frequency | |
| parent | staging: rtl8192u: fix sparse warning, make a function static (diff) | |
| parent | Linux 3.12-rc6 (diff) | |
| download | kernel-qcow2-linux-f7a0fd56e4f58aec3300082fc10433052e2f1863.tar.gz kernel-qcow2-linux-f7a0fd56e4f58aec3300082fc10433052e2f1863.tar.xz kernel-qcow2-linux-f7a0fd56e4f58aec3300082fc10433052e2f1863.zip | |
Merge 3.12-rc6 into staging-next.
We want these fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/frequency')
| -rw-r--r-- | drivers/iio/frequency/adf4350.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c index 85152547aa8b..63a25d9e1204 100644 --- a/drivers/iio/frequency/adf4350.c +++ b/drivers/iio/frequency/adf4350.c @@ -526,8 +526,10 @@ static int adf4350_probe(struct spi_device *spi) } indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); - if (indio_dev == NULL) - return -ENOMEM; + if (indio_dev == NULL) { + ret = -ENOMEM; + goto error_disable_clk; + } st = iio_priv(indio_dev); |