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).
This commit is contained in:
Warner Losh 2005-03-27 17:04:47 +00:00
parent f0d5beefb7
commit ee051f83d5

View File

@ -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,