diff options
| author | Warner Losh <imp@FreeBSD.org> | 1999-10-28 05:06:14 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 1999-10-28 05:06:14 +0000 |
| commit | 806338b15dadab05b391f7bd5b8154c4be99a0b0 (patch) | |
| tree | afd22399ee8fa07b71bfe89e5d7c4055ad7f9a27 /sys/dev/ep | |
| parent | 12e0beb470cf5766e06a59206d30770b5766f9e5 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ep')
| -rw-r--r-- | sys/dev/ep/if_ep_pccard.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c index 84a438cfdfd8..fb373d0e6863 100644 --- a/sys/dev/ep/if_ep_pccard.c +++ b/sys/dev/ep/if_ep_pccard.c @@ -73,17 +73,11 @@ ep_pccard_probe(device_t dev) { struct ep_softc * sc = device_get_softc(dev); struct ep_board * epb = &sc->epb; - u_int32_t port_start; - u_int32_t port_count; + u_long port_start; + u_long port_count; const char * desc; - const char * name; int error; - name = pccard_get_name(dev); - printf("ep_pccard_probe: Does %s match?\n", name); - if (strcmp(name, "ep")) - return ENXIO; - error = bus_get_resource(dev, SYS_RES_IOPORT, 0, &port_start, &port_count); if (error != 0) @@ -162,7 +156,7 @@ ep_pccard_attach(device_t dev) struct ep_softc * sc = device_get_softc(dev); int error = 0; - if (error = ep_alloc(dev)) { + if ((error = ep_alloc(dev))) { device_printf(dev, "ep_alloc() failed! (%d)\n", error); goto bad; } @@ -210,15 +204,15 @@ ep_pccard_attach(device_t dev) goto bad; } - if (error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, ep_intr, - sc, &sc->ep_intrhand)) { + if ((error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, ep_intr, + sc, &sc->ep_intrhand))) { device_printf(dev, "bus_setup_intr() failed! (%d)\n", error); goto bad; } return (0); bad: - ep_free(sc); + ep_free(dev); return (error); } |