Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325491
b: refs/heads/master
c: bea3e8a
h: refs/heads/master
i:
  325489: 4fef164
  325487: 4f49860
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Jonathan Cameron committed Sep 22, 2012
1 parent 44b2504 commit 96e1dd7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3183bac16f537503eb3177773781d6d3059ad7b1
refs/heads/master: bea3e8a31f42269318378461ee2663b17957b165
10 changes: 2 additions & 8 deletions trunk/drivers/staging/iio/gyro/adis16260_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -702,22 +702,16 @@ static int __devinit adis16260_probe(struct spi_device *spi)

static int __devexit adis16260_remove(struct spi_device *spi)
{
int ret;
struct iio_dev *indio_dev = spi_get_drvdata(spi);

iio_device_unregister(indio_dev);

ret = adis16260_stop_device(indio_dev);
if (ret)
goto err_ret;

adis16260_stop_device(indio_dev);
adis16260_remove_trigger(indio_dev);
iio_buffer_unregister(indio_dev);
adis16260_unconfigure_ring(indio_dev);
iio_device_free(indio_dev);

err_ret:
return ret;
return 0;
}

/*
Expand Down

0 comments on commit 96e1dd7

Please sign in to comment.