diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-12-06 20:52:15 +0100 |
|---|---|---|
| committer | Dominik Brodowski <brodo@isilmar.linta.de> | 2005-12-06 20:52:43 +0100 |
| commit | 37fad4fccd5c5b4b70ec364f4259ce1ba6db1340 (patch) | |
| tree | 52eed58e8e7a8e1e566099909f988b49dd34890f | |
| parent | 359369f2158fdbe00fc0dc62bd3b1a34a1cc8623 (diff) | |
| download | pcmciautils-37fad4fccd5c5b4b70ec364f4259ce1ba6db1340.tar.gz | |
Release of pcmciautils-007 (2005-07-23)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/pcmcia-check-broken-cis.c | 4 | ||||
| -rw-r--r-- | src/startup.c | 14 |
3 files changed, 9 insertions, 11 deletions
@@ -40,7 +40,7 @@ PCMCIA_SOCKET_STARTUP = pcmcia-socket-startup CBDUMP = cbdump CISDUMP = dump_cis -VERSION = 006 +VERSION = 007 #INSTALL_DIR = /usr/local/sbin RELEASE_NAME = pcmciautils-$(VERSION) diff --git a/src/pcmcia-check-broken-cis.c b/src/pcmcia-check-broken-cis.c index 6aa1576..82d8f14 100644 --- a/src/pcmcia-check-broken-cis.c +++ b/src/pcmcia-check-broken-cis.c @@ -33,9 +33,9 @@ struct needs_cis { static struct needs_cis cis_table[] = { /* "D-Link DE-650 Ethernet" */ - NEEDS_CIS_ENTRY(0x40, 0x0009, "D-Link PC Ethernet Card", "D-Link.dat"), + NEEDS_CIS_ENTRY(0x40, 0x0009, "D-Link PC Ethernet Card", "D-Link.cis"), /* "Linksys Ethernet E-CARD PC Ethernet Card */ - NEEDS_CIS_ENTRY(0x40, 0x0009, "E-CARD PC Ethernet Card", "E-CARD.dat"), + NEEDS_CIS_ENTRY(0x40, 0x0009, "E-CARD PC Ethernet Card", "E-CARD.cis"), { }, }; diff --git a/src/startup.c b/src/startup.c index 1eedbce..2f78c52 100644 --- a/src/startup.c +++ b/src/startup.c @@ -207,16 +207,14 @@ int main(int argc, char *argv[]) char *socket_no; unsigned long socket; - if (argc != 2) { - if ((socket_no = getenv("SOCKET_NO"))) { - socket = strtoul(argv[1], NULL, 0); - } else { - return -EINVAL; - } + if (argc == 2) { + socket = strtoul(argv[1], NULL, 0); + } else if ((socket_no = getenv("SOCKET_NO"))) { + socket = strtoul(socket_no, NULL, 0); + } else { + return -EINVAL; } - socket = strtoul(argv[1], NULL, 0); - load_config(); adjust_resources(socket); |