aboutsummaryrefslogtreecommitdiffstats
path: root/chipset_enable.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 /chipset_enable.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 'chipset_enable.c')
-rw-r--r--chipset_enable.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/chipset_enable.c b/chipset_enable.c
index b4ec96b0..687682a1 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -309,8 +309,9 @@ static int enable_flash_ich_4e(struct pci_dev *dev, const char *name)
static int enable_flash_ich_dc(struct pci_dev *dev, const char *name)
{
uint32_t fwh_conf;
+ int i, tmp;
char *idsel = NULL;
- int i, tmp, max_decode_fwh_idsel = 0, max_decode_fwh_decode = 0;
+ int max_decode_fwh_idsel = 0, max_decode_fwh_decode = 0;
int contiguous = 1;
idsel = extract_programmer_param("fwh_idsel");
@@ -1035,7 +1036,7 @@ static int get_flashbase_sc520(struct pci_dev *dev, const char *name)
}
} else {
msg_pinfo("AMD Elan SC520 detected, but no BOOTCS. "
- "Assuming flash at 4G\n");
+ "Assuming flash at 4G.\n");
}
/* 4. Clean up */