aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/cciss.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index bda6d1282377..e04c63ec7759 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -42,8 +42,8 @@
42#include <linux/compat.h> 42#include <linux/compat.h>
43#include <linux/mutex.h> 43#include <linux/mutex.h>
44#include <linux/bitmap.h> 44#include <linux/bitmap.h>
45#include <linux/io.h>
45#include <asm/uaccess.h> 46#include <asm/uaccess.h>
46#include <asm/io.h>
47 47
48#include <linux/dma-mapping.h> 48#include <linux/dma-mapping.h>
49#include <linux/blkdev.h> 49#include <linux/blkdev.h>
@@ -4267,10 +4267,7 @@ static void __devinit cciss_find_board_params(ctlr_info_t *h)
4267 4267
4268static inline bool CISS_signature_present(ctlr_info_t *h) 4268static inline bool CISS_signature_present(ctlr_info_t *h)
4269{ 4269{
4270 if ((readb(&h->cfgtable->Signature[0]) != 'C') || 4270 if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
4271 (readb(&h->cfgtable->Signature[1]) != 'I') ||
4272 (readb(&h->cfgtable->Signature[2]) != 'S') ||
4273 (readb(&h->cfgtable->Signature[3]) != 'S')) {
4274 dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); 4271 dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
4275 return false; 4272 return false;
4276 } 4273 }