diff --git a/[refs] b/[refs] index 3bef57744aa3..19ecb9e9a628 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c48cb9de1fb9702d5cfbf659840d02fb226b601 +refs/heads/master: 1b992320775691ba0124bd37c5fffe16172743cd diff --git a/trunk/drivers/staging/iio/cdc/ad7150.c b/trunk/drivers/staging/iio/cdc/ad7150.c index e185f0e052a3..a761ca94a17e 100644 --- a/trunk/drivers/staging/iio/cdc/ad7150.c +++ b/trunk/drivers/staging/iio/cdc/ad7150.c @@ -473,7 +473,7 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) if ((int_status & AD7150_STATUS_OUT1) && !(chip->old_state & AD7150_STATUS_OUT1)) iio_push_event(indio_dev, - IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, + IIO_UNMOD_EVENT_CODE(IIO_CAPACITANCE, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING), @@ -481,7 +481,7 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) else if ((!(int_status & AD7150_STATUS_OUT1)) && (chip->old_state & AD7150_STATUS_OUT1)) iio_push_event(indio_dev, - IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, + IIO_UNMOD_EVENT_CODE(IIO_CAPACITANCE, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), @@ -490,7 +490,7 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) if ((int_status & AD7150_STATUS_OUT2) && !(chip->old_state & AD7150_STATUS_OUT2)) iio_push_event(indio_dev, - IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, + IIO_UNMOD_EVENT_CODE(IIO_CAPACITANCE, 1, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING), @@ -498,7 +498,7 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) else if ((!(int_status & AD7150_STATUS_OUT2)) && (chip->old_state & AD7150_STATUS_OUT2)) iio_push_event(indio_dev, - IIO_UNMOD_EVENT_CODE(IIO_VOLTAGE, + IIO_UNMOD_EVENT_CODE(IIO_CAPACITANCE, 1, IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),