diff options
| author | Alan Cox | 2011-07-05 16:42:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-05 17:20:43 +0200 |
| commit | b21fb57908c02a9cc0a62edcffc7fba00286e6d2 (patch) | |
| tree | 3cdfe5ac42bf0856a971cc958ad23df3c90dc9b0 /drivers/staging/gma500/psb_lid.c | |
| parent | gma500: Rename the psb_intel_bios code (diff) | |
| download | kernel-qcow2-linux-b21fb57908c02a9cc0a62edcffc7fba00286e6d2.tar.gz kernel-qcow2-linux-b21fb57908c02a9cc0a62edcffc7fba00286e6d2.tar.xz kernel-qcow2-linux-b21fb57908c02a9cc0a62edcffc7fba00286e6d2.zip | |
gma500: tidy up the opregion and lid code
This is leaking an io mapping and also referencing stuff directly that
should not be directly accessed. Sort it out
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_lid.c')
| -rw-r--r-- | drivers/staging/gma500/psb_lid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/gma500/psb_lid.c b/drivers/staging/gma500/psb_lid.c index 21fd202f2931..af328516561e 100644 --- a/drivers/staging/gma500/psb_lid.c +++ b/drivers/staging/gma500/psb_lid.c @@ -32,10 +32,10 @@ static void psb_lid_timer_func(unsigned long data) u32 *lid_state = dev_priv->lid_state; u32 pp_status; - if (*lid_state == dev_priv->lid_last_state) + if (readl(lid_state) == dev_priv->lid_last_state) goto lid_timer_schedule; - if ((*lid_state) & 0x01) { + if ((readl(lid_state)) & 0x01) { /*lid state is open*/ REG_WRITE(PP_CONTROL, REG_READ(PP_CONTROL) | POWER_TARGET_ON); do { @@ -54,7 +54,7 @@ static void psb_lid_timer_func(unsigned long data) } /* printk(KERN_INFO"%s: lid: closed\n", __FUNCTION__); */ - dev_priv->lid_last_state = *lid_state; + dev_priv->lid_last_state = readl(lid_state); lid_timer_schedule: spin_lock_irqsave(&dev_priv->lid_lock, irq_flags); |