Patchwork [4/7] pflash_cfi01: remove redundant line

login
register
mail settings
Submitter Stefan Hajnoczi
Date April 20, 2012, 12:52 p.m.
Message ID <1334926356-7807-5-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/154033/
State New
Headers show

Comments

Stefan Hajnoczi - April 20, 2012, 12:52 p.m.
From: Eric Bénard <eric@eukrea.com>

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>
---
 hw/pflash_cfi01.c |    1 -
 1 file changed, 1 deletion(-)

Patch

diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index b03f623..d1c7423 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;
             }