diff options
| author | imp <imp@FreeBSD.org> | 2005-03-27 17:04:47 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-03-27 17:04:47 +0000 |
| commit | 2142ceb9b342c65782be810d5b81a66cea4c6c4b (patch) | |
| tree | 73435e9b45c00263fd7ab15855c411486ea39759 | |
| parent | 3097a0e69e17952e95215b746847fe1da3487a2b (diff) | |
| download | FreeBSD-src-2142ceb9b342c65782be810d5b81a66cea4c6c4b.zip FreeBSD-src-2142ceb9b342c65782be810d5b81a66cea4c6c4b.tar.gz | |
Unbreak style(9) breakage from last commit. We try to avoid defining
variables in internal blocks.
Also, go ahead and fail if we can't load the firmware. It should have
failed like this, but never did (firmware loads generally don't fail).
| -rw-r--r-- | sys/dev/wi/if_wi_pccard.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c index 4ef635a..e4bac8d 100644 --- a/sys/dev/wi/if_wi_pccard.c +++ b/sys/dev/wi/if_wi_pccard.c @@ -230,13 +230,11 @@ wi_pccard_attach(device_t dev) if (vendor == PCMCIA_VENDOR_SYMBOL && product == PCMCIA_PRODUCT_SYMBOL_LA4100) { #ifdef WI_SYMBOL_FIRMWARE - struct wi_softc *sc; - - sc = device_get_softc(dev); - if (wi_symbol_load_firm(sc, + if (wi_symbol_load_firm(device_get_softc(dev), spectrum24t_primsym, sizeof(spectrum24t_primsym), spectrum24t_secsym, sizeof(spectrum24t_secsym))) { device_printf(dev, "couldn't load firmware\n"); + return (ENXIO); } #else device_printf(dev, |
