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 --- chipset_enable.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chipset_enable.c') diff --git a/chipset_enable.c b/chipset_enable.c index b4ec96b..687682a 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 */ -- cgit v1.1