diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:31 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:31 +0800 |
| commit | 78278fb152735c686cb13e1ae3bcee78fc2cd154 (patch) | |
| tree | ed3f669fbb4422bf3dfaa6b20ea992c04c1eac01 /drivers/iio/adc/ti_am335x_adc.c | |
| parent | 084eedbddaa526f53b20291ee7176be269620301 (diff) | |
| parent | 92905e331aea278665c4b27fbb13c4547a8bcbb0 (diff) | |
Merge tag 'v4.9.35' into linux-linaro-lsk-v4.9lsk-v4.9-17.06
This is the 4.9.35 stable release
Diffstat (limited to 'drivers/iio/adc/ti_am335x_adc.c')
| -rw-r--r-- | drivers/iio/adc/ti_am335x_adc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c index 2de1f52f1b19..62b0dec6d777 100644 --- a/drivers/iio/adc/ti_am335x_adc.c +++ b/drivers/iio/adc/ti_am335x_adc.c @@ -484,7 +484,7 @@ static int tiadc_probe(struct platform_device *pdev) return -EINVAL; } - indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*indio_dev)); + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev)); if (indio_dev == NULL) { dev_err(&pdev->dev, "failed to allocate iio device\n"); return -ENOMEM; |