From d688991169af1ea546b24c3c1b11da6b73ed7df9 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 22 Sep 2012 09:56:00 +0100 Subject: [PATCH] --- yaml --- r: 325498 b: refs/heads/master c: 67ad4e08dcc772153fda90cc747cfc9e03ab44f6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/sca3000_core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fbdae07d7d54..5e86a4ef4274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e71a837c810587e12620c957f1464c0674220d51 +refs/heads/master: 67ad4e08dcc772153fda90cc747cfc9e03ab44f6 diff --git a/trunk/drivers/staging/iio/accel/sca3000_core.c b/trunk/drivers/staging/iio/accel/sca3000_core.c index 6d72d97fb9e5..ffd1697a9db0 100644 --- a/trunk/drivers/staging/iio/accel/sca3000_core.c +++ b/trunk/drivers/staging/iio/accel/sca3000_core.c @@ -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);