summaryrefslogtreecommitdiff
path: root/satasii.c
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2010-07-06 09:55:48 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2010-07-06 09:55:48 +0000
commit2147cd8d74457918a12cc92d282557f254cfca59 (patch)
tree46de6c5dc108fc2868603fdc606e7328a83f1703 /satasii.c
parent18d526136bbbe8ca443da212fd678de94a97fe8e (diff)
downloadflashrom-2147cd8d74457918a12cc92d282557f254cfca59.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! Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1070 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'satasii.c')
-rw-r--r--satasii.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/satasii.c b/satasii.c
index 81953a0..5c56293 100644
--- a/satasii.c
+++ b/satasii.c
@@ -46,8 +46,8 @@ int satasii_init(void)
get_io_perms();
- pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii,
- programmer_param);
+ pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii);
+
id = pcidev_dev->device_id;
if ((id == 0x3132) || (id == 0x3124)) {
@@ -71,7 +71,6 @@ int satasii_init(void)
int satasii_shutdown(void)
{
- free(programmer_param);
pci_cleanup(pacc);
release_io_perms();
return 0;