diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
| commit | 9811283a233b55428a99771f803d2ca0f80d29de (patch) | |
| tree | f41b7c5958f865c1015c3e2f29f0ffdfccdc78e6 /drivers/input/misc/lis302dl.c | |
| parent | dd6196f5cc0cd707e7f694f52d7e847e066a1967 (diff) | |
| parent | b90406de472c1aa5371ab593a2bb79136d5de658 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'drivers/input/misc/lis302dl.c')
| -rw-r--r-- | drivers/input/misc/lis302dl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c index f31e5488440..d345bfb2718 100644 --- a/drivers/input/misc/lis302dl.c +++ b/drivers/input/misc/lis302dl.c @@ -818,7 +818,6 @@ static int __devexit lis302dl_remove(struct spi_device *spi) #ifdef CONFIG_PM static u8 regs_to_save[] = { - LIS302DL_REG_CTRL1, LIS302DL_REG_CTRL2, LIS302DL_REG_CTRL3, LIS302DL_REG_FF_WU_CFG_1, @@ -833,7 +832,7 @@ static u8 regs_to_save[] = { LIS302DL_REG_CLICK_TIME_LIMIT, LIS302DL_REG_CLICK_LATENCY, LIS302DL_REG_CLICK_WINDOW, - + LIS302DL_REG_CTRL1, }; static int lis302dl_suspend(struct spi_device *spi, pm_message_t state) @@ -906,11 +905,6 @@ static int lis302dl_resume(struct spi_device *spi) if (__lis302dl_reset_device(lis)) dev_err(&spi->dev, "device BOOT reload failed\n"); - lis->regs[LIS302DL_REG_CTRL1] |= LIS302DL_CTRL1_PD | - LIS302DL_CTRL1_Xen | - LIS302DL_CTRL1_Yen | - LIS302DL_CTRL1_Zen; - /* restore registers after resume */ for (n = 0; n < ARRAY_SIZE(regs_to_save); n++) __reg_write(lis, regs_to_save[n], lis->regs[regs_to_save[n]]); |