From: Bastian Blank <bastian@waldi.eu.org>
Date: Fri, 24 Mar 2006 11:15:32 +0000 (-0800)
Subject: [PATCH] dasd: "cleanup dasd_ioctl" fix
X-Git-Tag: v2.6.17-rc1~957
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5029622ac86bb441dc5e641226fb1152fca02d7;p=linux-2.6

[PATCH] dasd: "cleanup dasd_ioctl" fix

Cast the argument correctly.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index d0c2d732dc..b8c80d28df 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -29,7 +29,7 @@ static int
 dasd_ioctl_api_version(void __user *argp)
 {
 	int ver = DASD_API_VERSION;
-	return put_user(ver, (int *)argp);
+	return put_user(ver, (int __user *)argp);
 }
 
 /*