From 082c8b559cd9f3262c9af58ac2f17f2cc8a09d8b Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 15 Aug 2011 19:54:20 +0000 Subject: Fixup of r1397 - Mixing uninitialized and initialized local variables leads to confusion. - ft2232_spi error cases should have gotten some error handling, and that's the reason the curly braces were there. - Fixing typos/wording in some places would have been nice given that those places were touched anyway. Corresponding to flashrom svn r1413. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner --- dediprog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dediprog.c') diff --git a/dediprog.c b/dediprog.c index d752fb47..58eeb446 100644 --- a/dediprog.c +++ b/dediprog.c @@ -496,7 +496,8 @@ static int dediprog_command_f(int timeout) static int parse_voltage(char *voltage) { char *tmp = NULL; - int i, millivolt, fraction = 0; + int i; + int millivolt = 0, fraction = 0; if (!voltage || !strlen(voltage)) { msg_perr("Empty voltage= specified.\n"); @@ -574,7 +575,8 @@ int dediprog_init(void) { struct usb_device *dev; char *voltage; - int millivolt = 3500, ret; + int millivolt = 3500; + int ret; msg_pspew("%s\n", __func__); -- cgit v1.2.3