From a16ad9edbe7c2e32157f1f0594272ea37f53443f Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 27 May 2010 15:13:53 -0500
Subject: [PATCH] --- yaml --- r: 204063 b: refs/heads/master c:
 cda7612d4b96d51324c6fc4d5e47d629da6cb500 h: refs/heads/master i:   204061:
 38d363759787fa6701c4f7a6fe36039452794cac   204059:
 2655b8bdb8bd72c38e1a45cf994a17d57f03733a   204055:
 41b21cc2218c0dcd97cc9ada2f06e753f45738c0   204047:
 695ea04f5571a6284eb0f2a330135324d4d90234   204031:
 a58b2f909037dae2cc7a3d6fa3d9307e20360bcf v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/hpsa.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8dbfa08bec15..9fcd5f17d1bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb6b2ae9058accd183fe8b31f1985312bf333624
+refs/heads/master: cda7612d4b96d51324c6fc4d5e47d629da6cb500
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 4d4ecca399ae..57d038045adc 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -3413,6 +3413,11 @@ static inline void hpsa_p600_dma_prefetch_quirk(struct ctlr_info *h)
 static int __devinit hpsa_enter_simple_mode(struct ctlr_info *h)
 {
 	int i;
+	u32 trans_support;
+
+	trans_support = readl(&(h->cfgtable->TransportSupport));
+	if (!(trans_support & SIMPLE_MODE))
+		return -ENOTSUPP;
 
 	h->max_commands = readl(&(h->cfgtable->CmdsOutMax));
 	/* Update the field, and then ring the doorbell */