diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 03:17:54 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 03:17:54 +0100 |
| commit | 70ac551651a2c5a234b703d9a495817f2ca09639 (patch) | |
| tree | 71f55b9a3de438969a7a0d951971febf59784294 /arch/arm/common/locomo.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [ARM] 3160/1: SharpSL: Add driver for Akita specific GPIOs (diff) | |
| download | linux-70ac551651a2c5a234b703d9a495817f2ca09639.tar.xz linux-70ac551651a2c5a234b703d9a495817f2ca09639.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/common/locomo.c')
| -rw-r--r-- | arch/arm/common/locomo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 557e52c1c869..1b7eaab02b9e 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -623,8 +623,6 @@ static int locomo_resume(struct platform_device *dev) locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD); spin_unlock_irqrestore(&lchip->lock, flags); - - dev->power.saved_state = NULL; kfree(save); return 0; @@ -775,7 +773,7 @@ static int locomo_probe(struct platform_device *dev) static int locomo_remove(struct platform_device *dev) { - struct locomo *lchip = platform__get_drvdata(dev); + struct locomo *lchip = platform_get_drvdata(dev); if (lchip) { __locomo_remove(lchip); |