From 6e8680abcff46a326a0cd04d1fcd96feb15bb2eb Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Sat, 12 Mar 2011 10:02:24 +0100
Subject: [PATCH] --- yaml --- r: 242921 b: refs/heads/master c:
 fcab1c112ade881d884cd7b8161f7543194d12e1 h: refs/heads/master i:   242919:
 ef8bfbf988485f598c6d9931b7297d4f8f910cc0 v: v3

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

diff --git a/[refs] b/[refs]
index 87771c0ef463..f69b7719f99a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16011131ced8bdb317e1bf03324ca78a27fa0a1c
+refs/heads/master: fcab1c112ade881d884cd7b8161f7543194d12e1
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index f21116cb8b82..25267e92ce31 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -1529,8 +1529,7 @@ static int cciss_bigpassthru(ctlr_info_t *h, void __user *argp)
 		return -EINVAL;
 	if (!capable(CAP_SYS_RAWIO))
 		return -EPERM;
-	ioc = (BIG_IOCTL_Command_struct *)
-	    kmalloc(sizeof(*ioc), GFP_KERNEL);
+	ioc = kmalloc(sizeof(*ioc), GFP_KERNEL);
 	if (!ioc) {
 		status = -ENOMEM;
 		goto cleanup1;