diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 10:12:41 -0700 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /drivers/staging/iio/accel/lis3l02dq_core.c | |
| parent | Input: add keypad driver for keys interfaced to TCA6416 (diff) | |
| parent | Linus 2.6.34 (diff) | |
| download | linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.tar.xz linux-dev-8d0bc2b456103a34c11e01305cd1aed1cde579e5.zip | |
Merge commit 'v2.6.34' into next
Diffstat (limited to 'drivers/staging/iio/accel/lis3l02dq_core.c')
| -rw-r--r-- | drivers/staging/iio/accel/lis3l02dq_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index ea76902797bb..82e43588e8a5 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c @@ -618,7 +618,7 @@ static int lis3l02dq_thresh_handler_th(struct iio_dev *dev_info, static void lis3l02dq_thresh_handler_bh_no_check(struct work_struct *work_s) { struct iio_work_cont *wc - = container_of(work_s, struct iio_work_cont, ws_nocheck); + = container_of(work_s, struct iio_work_cont, ws); struct lis3l02dq_state *st = wc->st; u8 t; |