| Message ID | 1334217107-24540-1-git-send-email-eric@eukrea.com |
|---|---|
| State | New |
| Headers | show |
On 12 April 2012 08:51, Eric Bénard <eric@eukrea.com> wrote: > Signed-off-by: Eric Bénard <eric@eukrea.com> > --- > hw/pflash_cfi01.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > 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; > } Reviewed-by: Peter Maydell <peter.maydell@linaro.org> -- PMM
On 16 April 2012 11:16, Peter Maydell <peter.maydell@linaro.org> wrote: > On 12 April 2012 08:51, Eric Bénard <eric@eukrea.com> wrote: >> Signed-off-by: Eric Bénard <eric@eukrea.com> >> --- >> hw/pflash_cfi01.c | 1 - >> 1 files changed, 0 insertions(+), 1 deletions(-) >> >> 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; >> } > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Oh, and I think this change should go through qemu-trivial [cc'd], since this device isn't ARM-specific and the second patch in this series doesn't depend on it. thanks -- PMM
On Thu, Apr 12, 2012 at 09:51:46AM +0200, Eric Bénard wrote: > Signed-off-by: Eric Bénard <eric@eukrea.com> > --- > hw/pflash_cfi01.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
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; }
Signed-off-by: Eric Bénard <eric@eukrea.com> --- hw/pflash_cfi01.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)