diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-07-06 09:55:48 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-07-06 09:55:48 +0000 |
commit | 89fa17203051d32533dc8bbe749bfcbf2aeb7d23 (patch) | |
tree | 46de6c5dc108fc2868603fdc606e7328a83f1703 /nic3com.c | |
parent | 7471fdafe16d4fb917ef4589172d54e16047942e (diff) | |
download | flashrom-89fa17203051d32533dc8bbe749bfcbf2aeb7d23.zip flashrom-89fa17203051d32533dc8bbe749bfcbf2aeb7d23.tar.gz |
Various places in the flashrom source feature custom parameter extraction from programmer_param
This led to wildly differing syntax for programmer parameters, and it also
voids pretty much every assumption you could make about programmer_param.
The latter is a problem for libflashrom. Use extract_param everywhere, clean
up related code and make it more foolproof. Add two instances of exit(1)
where we have no option to return an error. Remove six instances of exit(1)
where returning an error was possible. WARNING: This changes programmer
parameter syntax for a few programmers!
Corresponding to flashrom svn r1070.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'nic3com.c')
-rw-r--r-- | nic3com.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -59,7 +59,8 @@ int nic3com_init(void) get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, PCI_BASE_ADDRESS_0, - nics_3com, programmer_param); + nics_3com); + id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -96,7 +97,6 @@ int nic3com_shutdown(void) OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; |