evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream-fixes'

Browse source
This commit is contained in:
Jeff Garzik 2006-02-02 16:17:31 -05:00
commit 9ac341ae79
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/scsi/sata_mv.c
View file

@ -568,6 +568,12 @@ static const struct mv_hw_ops mv6xxx_ops = {
.reset_bus = mv_reset_pci_bus, .reset_bus = mv_reset_pci_bus,
}; };
/*
* module options
*/
static int msi; /* Use PCI msi; either zero (off, default) or non-zero */
/* /*
* Functions * Functions
*/ */
@ -2369,7 +2375,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
/* Enable interrupts */ /* Enable interrupts */
if (pci_enable_msi(pdev) == 0) { if (msi && pci_enable_msi(pdev) == 0) {
hpriv->hp_flags |= MV_HP_FLAG_MSI; hpriv->hp_flags |= MV_HP_FLAG_MSI;
} else { } else {
pci_intx(pdev, 1); pci_intx(pdev, 1);
@ -2424,5 +2430,8 @@ MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, mv_pci_tbl); MODULE_DEVICE_TABLE(pci, mv_pci_tbl);
MODULE_VERSION(DRV_VERSION); 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_init(mv_init);
module_exit(mv_exit); module_exit(mv_exit);