From 36d272235d214dd65a359a9435bb0ed33951ef1e Mon Sep 17 00:00:00 2001
From: Asai Thambi S P <asamymuthupa@micron.com>
Date: Wed, 5 Sep 2012 22:02:16 +0530
Subject: [PATCH] --- yaml --- r: 322976 b: refs/heads/master c:
 d7c8b945480b3505708c47aad2bca20bd20de2bd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d2b580cacd09..5b2ab6f936df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12a166c919310f4c967d0959b4ed073cced850d7
+refs/heads/master: d7c8b945480b3505708c47aad2bca20bd20de2bd
diff --git a/trunk/drivers/block/mtip32xx/mtip32xx.c b/trunk/drivers/block/mtip32xx/mtip32xx.c
index 2553c7353115..cf557a457cc0 100644
--- a/trunk/drivers/block/mtip32xx/mtip32xx.c
+++ b/trunk/drivers/block/mtip32xx/mtip32xx.c
@@ -2047,7 +2047,7 @@ static void mtip_set_timeout(struct host_to_dev_fis *fis, unsigned int *timeout)
 		*timeout = 240000; /* 4 minutes */
 		break;
 	case ATA_CMD_STANDBYNOW1:
-		*timeout = 10000;  /* 10 seconds */
+		*timeout = 120000;  /* 2 minutes */
 		break;
 	case 0xF7:
 	case 0xFA: