From 3da4d0e380178f151e2b9d1ed7df46fd8cc247cd Mon Sep 17 00:00:00 2001 From: Derek Basehore Date: Fri, 5 Oct 2012 00:54:00 +0100 Subject: [PATCH] --- yaml --- r: 337991 b: refs/heads/master c: 95273f8952a7e3a037e139eec0aa99872f086498 h: refs/heads/master i: 337989: 594e64fae646d149a0e5e49c7ad6081161dd9f00 337987: 08fc51bd183d84c3c96b6cc367c9391dc9d4d430 337983: 53277b33998b0d32023096ff20b77eb7970c01f1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/light/tsl2563.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f1aa5688f36c..b9be8db8e1ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3db9ef6eb39ac6d969787bc15756778c2c5ca66 +refs/heads/master: 95273f8952a7e3a037e139eec0aa99872f086498 diff --git a/trunk/drivers/staging/iio/light/tsl2563.c b/trunk/drivers/staging/iio/light/tsl2563.c index 954ca2c172c6..3f72543b188f 100644 --- a/trunk/drivers/staging/iio/light/tsl2563.c +++ b/trunk/drivers/staging/iio/light/tsl2563.c @@ -652,7 +652,7 @@ static int tsl2563_write_interrupt_config(struct iio_dev *indio_dev, } if (!state && (chip->intr & 0x30)) { - chip->intr |= ~0x30; + chip->intr &= ~0x30; ret = i2c_smbus_write_byte_data(chip->client, TSL2563_CMD | TSL2563_REG_INT, chip->intr); @@ -814,7 +814,7 @@ static int __devexit tsl2563_remove(struct i2c_client *client) if (!chip->int_enabled) cancel_delayed_work(&chip->poweroff_work); /* Ensure that interrupts are disabled - then flush any bottom halves */ - chip->intr |= ~0x30; + chip->intr &= ~0x30; i2c_smbus_write_byte_data(chip->client, TSL2563_CMD | TSL2563_REG_INT, chip->intr); flush_scheduled_work();