summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-04-12 09:51:46 +0200
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2012-04-20 13:14:53 +0100
commit4d6145488c84df52a2a0a20e3f36493d7417042a (patch)
treec9b3cb655e5c9e4dffb6bf67986d7e1151392293 /hw
parent5f8daf2e04709800531bc1ecbb7b49b637182777 (diff)
downloadqemu-4d6145488c84df52a2a0a20e3f36493d7417042a.tar.gz
pflash_cfi01: remove redundant line
Signed-off-by: Eric Bénard <eric@eukrea.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/pflash_cfi01.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index b03f623cb1..d1c742379b 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -144,7 +144,6 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset,
} else {
ret = p[offset];
ret |= p[offset + 1] << 8;
- ret |= p[offset + 1] << 8;
ret |= p[offset + 2] << 16;
ret |= p[offset + 3] << 24;
}