diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
| commit | 153b1e1fd957861e2c185473dd3c3d93561066e4 (patch) | |
| tree | c296359e8212ed83c2834b20a62b7a650f3d0fc2 /drivers/scsi/sym53c8xx_2/sym_nvram.c | |
| parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
| parent | c3e9dda4f5702ee5b346f4770de53f79e8ad1d8d (diff) | |
Automatic merge of ../scsi-misc-2.6-old/
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_nvram.c')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_nvram.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_nvram.c b/drivers/scsi/sym53c8xx_2/sym_nvram.c index 1b721e3ec52..cd9140e158c 100644 --- a/drivers/scsi/sym53c8xx_2/sym_nvram.c +++ b/drivers/scsi/sym53c8xx_2/sym_nvram.c @@ -270,6 +270,7 @@ static void S24C16_set_bit(struct sym_device *np, u_char write_bit, u_char *gpre } OUTB(np, nc_gpreg, *gpreg); + INB(np, nc_mbox1); udelay(5); } @@ -547,6 +548,7 @@ static int sym_read_Symbios_nvram(struct sym_device *np, Symbios_nvram *nvram) static void T93C46_Clk(struct sym_device *np, u_char *gpreg) { OUTB(np, nc_gpreg, *gpreg | 0x04); + INB(np, nc_mbox1); udelay(2); OUTB(np, nc_gpreg, *gpreg); } @@ -574,6 +576,7 @@ static void T93C46_Write_Bit(struct sym_device *np, u_char write_bit, u_char *gp *gpreg |= 0x10; OUTB(np, nc_gpreg, *gpreg); + INB(np, nc_mbox1); udelay(2); T93C46_Clk(np, gpreg); @@ -586,6 +589,7 @@ static void T93C46_Stop(struct sym_device *np, u_char *gpreg) { *gpreg &= 0xef; OUTB(np, nc_gpreg, *gpreg); + INB(np, nc_mbox1); udelay(2); T93C46_Clk(np, gpreg); @@ -733,7 +737,8 @@ static int sym_read_parisc_pdc(struct sym_device *np, struct pdc_initiator *pdc) return SYM_PARISC_PDC; } #else -static int sym_read_parisc_pdc(struct sym_device *np, struct pdc_initiator *x) +static inline int sym_read_parisc_pdc(struct sym_device *np, + struct pdc_initiator *x) { return 0; } |