summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <bastian@waldi.eu.org>2006-03-24 12:15:32 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 16:33:18 +0100
commitb5029622ac86bb441dc5e641226fb1152fca02d7 (patch)
treef84822901347b4ceaabb7ae58ed06de8e98e9a02
parent[PATCH] s390: kzalloc() conversion in drivers/s390 (diff)
downloadlinux-b5029622ac86bb441dc5e641226fb1152fca02d7.tar.xz
linux-b5029622ac86bb441dc5e641226fb1152fca02d7.zip
[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>
-rw-r--r--drivers/s390/block/dasd_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index d0c2d732dcff..b8c80d28df41 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);
}
/*