30c30
< __FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 145000 2005-04-13 07:14:17Z sos $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ata/ata-card.c 145499 2005-04-25 07:57:04Z sos $");
72,74c72,73
< error = pccard_get_function(dev, &fcn);
< if (error != 0)
< return (error);
---
> if ((error = pccard_get_function(dev, &fcn)))
> return error;
78c77
< return (0);
---
> return 0;
85c84
< return (0);
---
> return 0;
87c86
< return(ENXIO);
---
> return ENXIO;
99,101c98,99
< io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
< ATA_IOSIZE, RF_ACTIVE);
< if (!io)
---
> if (!(io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
> ATA_IOSIZE, RF_ACTIVE)))
121,123c119,120
< ctlio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
< ATA_CTLIOSIZE, RF_ACTIVE);
< if (!ctlio) {
---
> if (!(ctlio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
> ATA_CTLIOSIZE, RF_ACTIVE))) {