diff --git a/[refs] b/[refs] index db468269cbfa..1b867b31262c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cb2e629a240d3b7cc35d2d144149591e1cfa8dd +refs/heads/master: 5d4172cd63bd7a70007ce9d4d1fb48953323c328 diff --git a/trunk/drivers/staging/iio/iio_simple_dummy.c b/trunk/drivers/staging/iio/iio_simple_dummy.c index 3b4513cf5ab9..310411911ed7 100644 --- a/trunk/drivers/staging/iio/iio_simple_dummy.c +++ b/trunk/drivers/staging/iio/iio_simple_dummy.c @@ -470,8 +470,6 @@ static int __devinit iio_dummy_probe(int index) error_unregister_events: iio_simple_dummy_events_unregister(indio_dev); error_free_device: - /* Note free device should only be called, before registration - * has succeeded. */ iio_device_free(indio_dev); error_ret: return ret;