diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:21:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:21:27 -0400 |
| commit | 688d22e23ab1caacb2c36c615854294b58f2ea47 (patch) | |
| tree | 95c8163c0b1f56902f5537bc256d7e5507f56cee /drivers/scsi/qla2xxx/qla_inline.h | |
| parent | 7e0edc1bc343231029084761ebf59e522902eb49 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_inline.h')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_inline.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h index e9bae27737d1..92fafbdbbaab 100644 --- a/drivers/scsi/qla2xxx/qla_inline.h +++ b/drivers/scsi/qla2xxx/qla_inline.h | |||
| @@ -34,7 +34,11 @@ qla2x00_debounce_register(volatile uint16_t __iomem *addr) | |||
| 34 | static inline void | 34 | static inline void |
| 35 | qla2x00_poll(scsi_qla_host_t *ha) | 35 | qla2x00_poll(scsi_qla_host_t *ha) |
| 36 | { | 36 | { |
| 37 | unsigned long flags; | ||
| 38 | |||
| 39 | local_irq_save(flags); | ||
| 37 | ha->isp_ops->intr_handler(0, ha); | 40 | ha->isp_ops->intr_handler(0, ha); |
| 41 | local_irq_restore(flags); | ||
| 38 | } | 42 | } |
| 39 | 43 | ||
| 40 | static __inline__ scsi_qla_host_t * | 44 | static __inline__ scsi_qla_host_t * |