diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-19 14:25:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-19 14:25:56 -0800 |
| commit | c7eeae734f38bcdce97d43152bf9db6b9b18759a (patch) | |
| tree | 4ae38824919321fda691dc79540637fa48d6a80d /drivers/scsi/sym53c8xx_2/sym_hipd.c | |
| parent | 3a6927906f1b2adf5a31b789322d32eb8559ada0 (diff) | |
| parent | a169e63740779f62a9a5ddf0aa61091a393a03c5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] initio: bugfix for accessors patch
[SCSI] st: fix kernel BUG at include/linux/scatterlist.h:59!
[SCSI] initio: fix conflict when loading driver
[SCSI] sym53c8xx: fix "irq X: nobody cared" regression
[SCSI] dpt_i2o: driver is only 32 bit so don't set 64 bit DMA mask
[SCSI] sym53c8xx: fix free_irq() regression
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_hipd.c')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index 463f119f20e..254bdaeb35f 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c @@ -2791,7 +2791,7 @@ irqreturn_t sym_interrupt(struct Scsi_Host *shost) istat = INB(np, nc_istat); if (istat & INTF) { OUTB(np, nc_istat, (istat & SIGP) | INTF | np->istat_sem); - istat = INB(np, nc_istat); /* DUMMY READ */ + istat |= INB(np, nc_istat); /* DUMMY READ */ if (DEBUG_FLAGS & DEBUG_TINY) printf ("F "); sym_wakeup_done(np); } |