From afd4a65225318ec7900871ed69a46ce992637ef2 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 9 Nov 2011 20:46:35 +0000 Subject: [PATCH] hw/pxa2xx.c: Fix handling of R/WC bits in PMCR Fix a bug in handling the write-one-to-clear bits in the PMCR which meant that we would always clear the bit even if the value written was a zero. Spotted by Coverity (see bug 887883). Signed-off-by: Peter Maydell Signed-off-by: Anthony Liguori --- hw/pxa2xx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index bfc28a999b..d38b922924 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -114,7 +114,9 @@ static void pxa2xx_pm_write(void *opaque, target_phys_addr_t addr, switch (addr) { case PMCR: - s->pm_regs[addr >> 2] &= 0x15 & ~(value & 0x2a); + /* Clear the write-one-to-clear bits... */ + s->pm_regs[addr >> 2] &= ~(value & 0x2a); + /* ...and set the plain r/w bits */ s->pm_regs[addr >> 2] |= value & 0x15; break; -- 2.11.4.GIT