patch-2.4.18 linux/drivers/net/irda/w83977af_ir.c
Next file: linux/drivers/net/mace.c
Previous file: linux/drivers/net/irda/nsc-ircc.c
Back to the patch index
Back to the overall index
- Lines: 26
- Date:
Thu Jan 10 18:12:40 2002
- Orig file:
linux.orig/drivers/net/irda/w83977af_ir.c
- Orig date:
Mon Feb 18 20:18:39 2002
diff -Naur -X /home/marcelo/lib/dontdiff linux.orig/drivers/net/irda/w83977af_ir.c linux/drivers/net/irda/w83977af_ir.c
@@ -160,7 +160,7 @@
{
struct net_device *dev;
struct w83977af_ir *self;
- int ret;
+ void *ret;
int err;
IRDA_DEBUG(0, __FUNCTION__ "()\n");
@@ -190,14 +190,13 @@
self->io.fifo_size = 32;
/* Lock the port that we need */
- ret = check_region(self->io.fir_base, self->io.fir_ext);
- if (ret < 0) {
+ ret = request_region(self->io.fir_base, self->io.fir_ext, driver_name);
+ if (!ret) {
IRDA_DEBUG(0, __FUNCTION__ "(), can't get iobase of 0x%03x\n",
self->io.fir_base);
/* w83977af_cleanup( self); */
return -ENODEV;
}
- request_region(self->io.fir_base, self->io.fir_ext, driver_name);
/* Initialize QoS for this device */
irda_init_max_qos_capabilies(&self->qos);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)