Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325498
b: refs/heads/master
c: 67ad4e0
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Jonathan Cameron committed Sep 22, 2012
1 parent 48341f5 commit d688991
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: e71a837c810587e12620c957f1464c0674220d51
refs/heads/master: 67ad4e08dcc772153fda90cc747cfc9e03ab44f6
6 changes: 2 additions & 4 deletions trunk/drivers/staging/iio/accel/sca3000_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1237,11 +1237,9 @@ static int __devexit sca3000_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct sca3000_state *st = iio_priv(indio_dev);
int ret;

/* Must ensure no interrupts can be generated after this!*/
ret = sca3000_stop_all_interrupts(st);
if (ret)
return ret;
sca3000_stop_all_interrupts(st);
if (spi->irq)
free_irq(spi->irq, indio_dev);
iio_device_unregister(indio_dev);
Expand Down

0 comments on commit d688991

Please sign in to comment.