diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 16:17:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 16:17:31 -0500 |
| commit | 9ac341ae799413708e674bc65c8a72c90dae8d34 (patch) | |
| tree | e4b4f21c424e1843ce2155f060e8930154b0476b /drivers | |
| parent | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (diff) | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index b55dd839ddbd..3e916327ae37 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -569,6 +569,12 @@ static const struct mv_hw_ops mv6xxx_ops = { }; /* + * module options + */ +static int msi; /* Use PCI msi; either zero (off, default) or non-zero */ + + +/* * Functions */ @@ -2369,7 +2375,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } /* Enable interrupts */ - if (pci_enable_msi(pdev) == 0) { + if (msi && pci_enable_msi(pdev) == 0) { hpriv->hp_flags |= MV_HP_FLAG_MSI; } else { pci_intx(pdev, 1); @@ -2424,5 +2430,8 @@ MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(pci, mv_pci_tbl); MODULE_VERSION(DRV_VERSION); +module_param(msi, int, 0444); +MODULE_PARM_DESC(msi, "Enable use of PCI MSI (0=off, 1=on)"); + module_init(mv_init); module_exit(mv_exit); |