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 <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>

1 files changed, 4 insertions, 2 deletions

diff --git a/dediprog.c b/dediprog.c
index d752fb4..58eeb44 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__);