diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-29 17:50:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 17:06:03 -0700 |
| commit | b98c9e60a44645737fa2ffef9a2d1ef2243c50d5 (patch) | |
| tree | 007822fa9ada863007c195152dd303cecf766d0f /drivers/staging/iio/accel/lis3l02dq_core.c | |
| parent | 34f57cc7894b7ba124006149a0c7b5f58496b25f (diff) | |
staging: iio: lis3l02dq add a thresh_timestamp field to state for no ring case
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/lis3l02dq_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index b04f498c0d67..0ee933737545 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c @@ -615,7 +615,7 @@ static int lis3l02dq_thresh_handler_th(struct iio_dev *indio_dev, struct lis3l02dq_state *st = lis3l02dq_h_to_s(h); /* Stash the timestamp somewhere convenient for the bh */ - h->last_timestamp = timestamp; + st->thresh_timestamp = timestamp; schedule_work(&st->work_thresh); return 0; @@ -640,32 +640,32 @@ static void lis3l02dq_thresh_handler_bh_no_check(struct work_struct *work_s) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH) iio_push_event(st->help.indio_dev, 0, IIO_EVENT_CODE_ACCEL_Z_HIGH, - st->help.last_timestamp); + st->thresh_timestamp); if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_LOW) iio_push_event(st->help.indio_dev, 0, IIO_EVENT_CODE_ACCEL_Z_LOW, - st->help.last_timestamp); + st->thresh_timestamp); if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_HIGH) iio_push_event(st->help.indio_dev, 0, IIO_EVENT_CODE_ACCEL_Y_HIGH, - st->help.last_timestamp); + st->thresh_timestamp); if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_LOW) iio_push_event(st->help.indio_dev, 0, IIO_EVENT_CODE_ACCEL_Y_LOW, - st->help.last_timestamp); + st->thresh_timestamp); if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_HIGH) iio_push_event(st->help.indio_dev, 0, IIO_EVENT_CODE_ACCEL_X_HIGH, - st->help.last_timestamp); + st->thresh_timestamp); if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_LOW) iio_push_event(st->help.indio_dev, 0, IIO_EVENT_CODE_ACCEL_X_LOW, - st->help.last_timestamp); + st->thresh_timestamp); /* reenable the irq */ enable_irq(st->us->irq); /* Ack and allow for new interrupts */ |