* Zubair Lutfullah | 2013-08-25 23:45:24 [+0100]:
>diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
>index a952538..ae2202b 100644
>--- a/drivers/iio/adc/ti_am335x_adc.c
>+++ b/drivers/iio/adc/ti_am335x_adc.c
…
>+static struct iio_trigger *tiadc_iio_allocate_trigger(struct iio_dev
>*indio_dev)
>+{
>+ struct iio_trigger *trig;
>+ int ret;
>+
>+ trig = iio_trigger_alloc("%s-dev%d", indio_dev->name, indio_dev->id);
>+ if (trig == NULL)
>+ return NULL;
>+
>+ trig->dev.parent = indio_dev->dev.parent;
>+ trig->ops = &tiadc_trigger_ops;
>+ iio_trigger_set_drvdata(trig, indio_dev);
>+
>+ ret = iio_trigger_register(trig);
>+ if (ret)
shouldn't you free the trigger / undo iio_trigger_alloc() here?
>+ return NULL;
>+
>+ return trig;
> }
>
> static const char * const chan_name_ain[] = {
>@@ -220,7 +394,8 @@ static int tiadc_probe(struct platform_device *pdev)
> sizeof(struct tiadc_device));
> if (indio_dev == NULL) {
> dev_err(&pdev->dev, "failed to allocate iio device\n");
>- return -ENOMEM;
>+ err = -ENOMEM;
>+ goto err_ret;
Why the jump instead of leave right away?
> }
> adc_dev = iio_priv(indio_dev);
>
>@@ -262,11 +465,14 @@ static int tiadc_remove(struct platform_device *pdev)
> struct tiadc_device *adc_dev = iio_priv(indio_dev);
> u32 step_en;
>
>+ free_irq(adc_dev->irq, indio_dev);
> iio_device_unregister(indio_dev);
>+ iio_buffer_unregister(indio_dev);
> tiadc_channels_remove(indio_dev);
I think you need also to
iio_trigger_unregister(adc_dev->trig);
iio_trigger_free(adc_dev->trig);
here.
> step_en = get_adc_step_mask(adc_dev);
> am335x_tsc_se_clr(adc_dev->mfd_tscadc, step_en);
>+ iio_device_free(indio_dev);
>
> return 0;
> }
Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
