From d240423d76dbc18193db43f980a4fb197c86e146 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 3 Jan 2007 08:10:35 +0100
Subject: [PATCH] --- yaml --- r: 45183 b: refs/heads/master c:
 2e11c207b029cfaf57159cabac4b002204445258 h: refs/heads/master i:   45181:
 a80c05480a7a15c70790ae20402da2c47ab68371   45179:
 88ecfeab683f138d4022607994b3ca5c6e9c500e   45175:
 27e412464c14ba69f75bf84e66c24ee778962b29   45167:
 23f580b5e2ccf521c1c0a8b8ec85408641902e21   45151:
 ad90f7701f3834070e37d0d203a1a846eb42d28a   45119:
 4568485caa4800b80df391661da289dc6fad23ea   45055:
 dc1301f5a6cc3b4a27080b5c73daa03b54721a0d v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/cdrom/cdrom.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2f59978ea45..c8538239f6ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7523c4dd9923cab748dad9b79d0165e118e3d03b
+refs/heads/master: 2e11c207b029cfaf57159cabac4b002204445258
diff --git a/trunk/drivers/cdrom/cdrom.c b/trunk/drivers/cdrom/cdrom.c
index 66d028d30439..3105dddf59f1 100644
--- a/trunk/drivers/cdrom/cdrom.c
+++ b/trunk/drivers/cdrom/cdrom.c
@@ -337,6 +337,12 @@ static const char *mrw_address_space[] = { "DMA", "GAA" };
 /* used in the audio ioctls */
 #define CHECKAUDIO if ((ret=check_for_audio_disc(cdi, cdo))) return ret
 
+/*
+ * Another popular OS uses 7 seconds as the hard timeout for default
+ * commands, so it is a good choice for us as well.
+ */
+#define CDROM_DEF_TIMEOUT	(7 * HZ)
+
 /* Not-exported routines. */
 static int open_for_data(struct cdrom_device_info * cdi);
 static 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,
 	cgc->buffer = (char *) buf;
 	cgc->buflen = len;
 	cgc->data_direction = type;
-	cgc->timeout = 5*HZ;
+	cgc->timeout = CDROM_DEF_TIMEOUT;
 }
 
 /* DVD handling */