Merge 3.12-rc6 into staging-next.
We want these fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user