summaryrefslogtreecommitdiffstats
path: root/dediprog.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2011-08-15 19:54:20 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2011-08-15 19:54:20 +0000
commit082c8b559cd9f3262c9af58ac2f17f2cc8a09d8b (patch)
treece63847ee6cc1e63289e3f658a5d57ebd35b3619 /dediprog.c
parent0528b7fefa6daf35365c1dee0d21bc94e8120f78 (diff)
downloadflashrom-082c8b559cd9f3262c9af58ac2f17f2cc8a09d8b.tar.gz
flashrom-082c8b559cd9f3262c9af58ac2f17f2cc8a09d8b.tar.bz2
flashrom-082c8b559cd9f3262c9af58ac2f17f2cc8a09d8b.zip
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>
Diffstat (limited to 'dediprog.c')
-rw-r--r--dediprog.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/dediprog.c b/dediprog.c
index d752fb473..58eeb4463 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__);