diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/i2o | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/i2o')
| -rw-r--r-- | drivers/i2o/i2o_core.c | 2 | ||||
| -rw-r--r-- | drivers/i2o/i2o_scsi.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/i2o/i2o_core.c b/drivers/i2o/i2o_core.c index d39e32529..87871fa15 100644 --- a/drivers/i2o/i2o_core.c +++ b/drivers/i2o/i2o_core.c @@ -183,7 +183,7 @@ static struct reply_info events[I2O_EVT_Q_LEN]; static int evt_in = 0; static int evt_out = 0; static int evt_q_len = 0; -#define MODINC(x,y) (x = x++ % y) +#define MODINC(x,y) ((x) = ((x) + 1) % (y)) /* * I2O configuration spinlock. This isnt a big deal for contention diff --git a/drivers/i2o/i2o_scsi.c b/drivers/i2o/i2o_scsi.c index 3c147cf9f..1985d68ea 100644 --- a/drivers/i2o/i2o_scsi.c +++ b/drivers/i2o/i2o_scsi.c @@ -437,6 +437,8 @@ int i2o_scsi_detect(Scsi_Host_Template * tpnt) continue; shpnt = scsi_register(tpnt, sizeof(struct i2o_scsi_host)); + if(shpnt==NULL) + continue; save_flags(flags); cli(); shpnt->unique_id = (u32)d; @@ -902,12 +904,8 @@ int i2o_scsi_bios_param(Disk * disk, kdev_t dev, int *ip) return 0; } -/* Loadable module support */ -#ifdef MODULE - MODULE_AUTHOR("Red Hat Software"); -Scsi_Host_Template driver_template = I2OSCSI; +static Scsi_Host_Template driver_template = I2OSCSI; #include "../scsi/scsi_module.c" -#endif |