From c49bb33e8aa0b618797b7943dddac11e5aa0e818 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 4 Feb 2010 08:41:38 -0600
Subject: [PATCH] --- yaml --- r: 181317 b: refs/heads/master c:
 82a72c0a12326a56a323093297e2bad29fe6c29d h: refs/heads/master i:   181315:
 4d6a94b8ae96ede3c20f66ee8805c547e1429787 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/scsi/hpsa.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 377b049f2c97..02d747a20b81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a02ffcd55b74e3459bb7358140970e126d4731
+refs/heads/master: 82a72c0a12326a56a323093297e2bad29fe6c29d
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 0f4a1f3c7e9f..ee9db5ee3cb1 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -431,7 +431,7 @@ static ssize_t raid_level_show(struct device *dev,
 	     struct device_attribute *attr, char *buf)
 {
 	ssize_t l = 0;
-	int rlevel;
+	unsigned char rlevel;
 	struct ctlr_info *h;
 	struct scsi_device *sdev;
 	struct hpsa_scsi_dev_t *hdev;
@@ -455,7 +455,7 @@ static ssize_t raid_level_show(struct device *dev,
 
 	rlevel = hdev->raid_level;
 	spin_unlock_irqrestore(&h->lock, flags);
-	if (rlevel < 0 || rlevel > RAID_UNKNOWN)
+	if (rlevel > RAID_UNKNOWN)
 		rlevel = RAID_UNKNOWN;
 	l = snprintf(buf, PAGE_SIZE, "RAID %s\n", raid_label[rlevel]);
 	return l;