aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-01-03 02:10:35 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-03 20:32:54 -0500
commit2e11c207b029cfaf57159cabac4b002204445258 (patch)
tree4d22832e749ebbf2c49b410a5762472b0386cda6 /drivers/cdrom
parent7523c4dd9923cab748dad9b79d0165e118e3d03b (diff)
[PATCH] cdrom: set default timeout to 7 seconds
It's a known fact that Windows times out commands after 7 seconds, so drives generally try and respond if they can before that happens. We default to 5 seconds, which sometimes is a bit too short. Jeremy Higdon reported here: http://lkml.org/lkml/2007/1/1/145 that his drive takes longer than 5 seconds for a "read track information" command, later confirming that it is about 6.7 seconds. So just do the sane thing and change the default command timeout to 7 seconds to avoid other surprises. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/cdrom.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 66d028d30439..3105dddf59f1 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -337,6 +337,12 @@ static const char *mrw_address_space[] = { "DMA", "GAA" };
337/* used in the audio ioctls */ 337/* used in the audio ioctls */
338#define CHECKAUDIO if ((ret=check_for_audio_disc(cdi, cdo))) return ret 338#define CHECKAUDIO if ((ret=check_for_audio_disc(cdi, cdo))) return ret
339 339
340/*
341 * Another popular OS uses 7 seconds as the hard timeout for default
342 * commands, so it is a good choice for us as well.
343 */
344#define CDROM_DEF_TIMEOUT (7 * HZ)
345
340/* Not-exported routines. */ 346/* Not-exported routines. */
341static int open_for_data(struct cdrom_device_info * cdi); 347static int open_for_data(struct cdrom_device_info * cdi);
342static int check_for_audio_disc(struct cdrom_device_info * cdi, 348static int check_for_audio_disc(struct cdrom_device_info * cdi,
@@ -1528,7 +1534,7 @@ void init_cdrom_command(struct packet_command *cgc, void *buf, int len,
1528 cgc->buffer = (char *) buf; 1534 cgc->buffer = (char *) buf;
1529 cgc->buflen = len; 1535 cgc->buflen = len;
1530 cgc->data_direction = type; 1536 cgc->data_direction = type;
1531 cgc->timeout = 5*HZ; 1537 cgc->timeout = CDROM_DEF_TIMEOUT;
1532} 1538}
1533 1539
1534/* DVD handling */ 1540/* DVD handling */