Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d2e402 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: Increase adapter operational timeout 



Increases the adapter operational timeout for some adapters that support
dual controller configurations, since they may take longer to come ready.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 65f56475

drivers/scsi/ipr.c

+6 −3
Original line number Diff line number Diff line
@@ -7611,19 +7611,22 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = { 
	{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },

	{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572A, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0, 0 },

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572B, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT},

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0, 0 },

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },