[Qemu-devel] [PATCH] ds1338: Add missing break statement

[Qemu-devel] [PATCH] ds1338: Add missing break statement

[Stefan Weil]

Without the break statement, case 5 sets month and year from the same
data. This does not look correct.

The missing break was reported by splint.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/ds1338.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/ds1338.c b/hw/ds1338.c
index 6397f0a..d590d9c 100644
--- a/hw/ds1338.c
+++ b/hw/ds1338.c
@@ -100,6 +100,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data)
             break;
         case 5:
             s->now.tm_mon = from_bcd(data & 0x1f) - 1;
+            break;
         case 6:
             s->now.tm_year = from_bcd(data) + 100;
             break;
-- 
1.7.9

Re: [Qemu-devel] [PATCH] ds1338: Add missing break statement

[Peter Maydell]

On 25 February 2012 13:50, Stefan Weil <sw@weilnetz.de> wrote:
> Without the break statement, case 5 sets month and year from the same
> data. This does not look correct.

Yep, looks like a simple missing break, checked against the
datasheet at http://datasheets.maxim-ic.com/en/ds/DS1338-DS1338Z.pdf

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Re: [Qemu-devel] [PATCH] ds1338: Add missing break statement

[Stefan Weil]

Am 25.02.2012 14:50, schrieb Stefan Weil:
> Without the break statement, case 5 sets month and year from the same
> data. This does not look correct.
>
> The missing break was reported by splint.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> hw/ds1338.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/hw/ds1338.c b/hw/ds1338.c
> index 6397f0a..d590d9c 100644
> --- a/hw/ds1338.c
> +++ b/hw/ds1338.c
> @@ -100,6 +100,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data)
> break;
> case 5:
> s->now.tm_mon = from_bcd(data & 0x1f) - 1;
> + break;
> case 6:
> s->now.tm_year = from_bcd(data) + 100;
> break;

Ping. This is a simple bug fix. It was reviewed by Peter Maydell (thanks!).
Could someone please commit it to QEMU master (maybe to stable-1.0, too)?

Regards,
Stefan Weil

Re: [Qemu-devel] [PATCH] ds1338: Add missing break statement

[Andreas Färber]

Am 25.02.2012 14:50, schrieb Stefan Weil:
> Without the break statement, case 5 sets month and year from the same
> data. This does not look correct.
> 
> The missing break was reported by splint.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Assigning data to both month and year certainly makes no sense,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas

> ---
>  hw/ds1338.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/ds1338.c b/hw/ds1338.c
> index 6397f0a..d590d9c 100644
> --- a/hw/ds1338.c
> +++ b/hw/ds1338.c
> @@ -100,6 +100,7 @@ static int ds1338_send(I2CSlave *i2c, uint8_t data)
>              break;
>          case 5:
>              s->now.tm_mon = from_bcd(data & 0x1f) - 1;
> +            break;
>          case 6:
>              s->now.tm_year = from_bcd(data) + 100;
>              break;

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH] ds1338: Add missing break statement

[Stefan Hajnoczi]

On Sat, Feb 25, 2012 at 02:50:25PM +0100, Stefan Weil wrote:
> Without the break statement, case 5 sets month and year from the same
> data. This does not look correct.
> 
> The missing break was reported by splint.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  hw/ds1338.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Sorry, looks like I missed a couple of your patches in my inbox.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan