diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 16:14:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-19 16:14:34 -0400 |
| commit | f7a0fd56e4f58aec3300082fc10433052e2f1863 (patch) | |
| tree | 4b3348f4866f6b3417f456a298229d63d4581424 /drivers/iio/frequency | |
| parent | 5e1e704a7de14ae79dc4d983dbbcab67064960c9 (diff) | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
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) | |||
| 526 | } | 526 | } |
| 527 | 527 | ||
| 528 | indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); | 528 | indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); |
| 529 | if (indio_dev == NULL) | 529 | if (indio_dev == NULL) { |
| 530 | return -ENOMEM; | 530 | ret = -ENOMEM; |
| 531 | goto error_disable_clk; | ||
| 532 | } | ||
| 531 | 533 | ||
| 532 | st = iio_priv(indio_dev); | 534 | st = iio_priv(indio_dev); |
| 533 | 535 | ||