From 701a1d041948f98de700925931654d595cd62ff4 Mon Sep 17 00:00:00 2001 From: Tomas Henzl Date: Mon, 28 Nov 2011 15:39:55 +0100 Subject: [PATCH] --- yaml --- r: 282248 b: refs/heads/master c: 7af0abbc2ffcae601ea14e39048901833528f104 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1ff60e3ada05..62d22adee164 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45bcf018d1a4779d592764ef57517c92589d55d7 +refs/heads/master: 7af0abbc2ffcae601ea14e39048901833528f104 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 594ce8316727..5140f5d0fd6b 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -293,12 +293,14 @@ static u32 unresettable_controller[] = { 0x3215103C, /* Smart Array E200i */ 0x3237103C, /* Smart Array E500 */ 0x323D103C, /* Smart Array P700m */ + 0x40800E11, /* Smart Array 5i */ 0x409C0E11, /* Smart Array 6400 */ 0x409D0E11, /* Smart Array 6400 EM */ }; /* List of controllers which cannot even be soft reset */ static u32 soft_unresettable_controller[] = { + 0x40800E11, /* Smart Array 5i */ /* Exclude 640x boards. These are two pci devices in one slot * which share a battery backed cache module. One controls the * cache, the other accesses the cache through the one that controls