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

Commit 14faf12f authored by Alan Stern's avatar Alan Stern Committed by James Bottomley
Browse files

[SCSI] Increase default timeout for INQUIRY 



This patch (as1224) changes the default timeout for INQUIRY commands
from 3 seconds to 20 seconds, which is the value used by Windows for
USB Mass-Storage devices.  Some of these devices, like the Corsair
Flash Voyager (see Bugzilla #12188) really do need a long timeout.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 20b09c29

drivers/scsi/scsi_scan.c

+2 −2
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ MODULE_PARM_DESC(max_report_luns, 
		 "REPORT LUNS maximum number of LUNS received (should be"

		 " between 1 and 16384)");



static unsigned int scsi_inq_timeout = SCSI_TIMEOUT/HZ+3;

static unsigned int scsi_inq_timeout = SCSI_TIMEOUT/HZ + 18;



module_param_named(inq_timeout, scsi_inq_timeout, uint, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(inq_timeout, 

		 "Timeout (in seconds) waiting for devices to answer INQUIRY."

		 " Default is 5. Some non-compliant devices need more.");

		 " Default is 20. Some devices may need more; most need less.");



/* This lock protects only this list */

static DEFINE_SPINLOCK(async_scan_lock);