diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-21 00:34:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:54:18 -0400 |
commit | 0191492309432aab9c1e224691dcb05a3563726a (patch) | |
tree | 1feb8d326e002f057700985d357fd5522ba0bd1f /drivers/staging/comedi/comedi_compat32.c | |
parent | 180027136b30d25f3824573e77c080056dc3e6d4 (diff) |
Staging: comedi: fix 64bit build errors
This patch fixes the 64bit build errors in the comedi code.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedi_compat32.c')
-rw-r--r-- | drivers/staging/comedi/comedi_compat32.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/comedi_compat32.c b/drivers/staging/comedi/comedi_compat32.c index 2fa771e4c12..1b9c2a7c824 100644 --- a/drivers/staging/comedi/comedi_compat32.c +++ b/drivers/staging/comedi/comedi_compat32.c | |||
@@ -37,16 +37,16 @@ | |||
37 | #include <linux/ioctl32.h> /* for (un)register_ioctl32_conversion */ | 37 | #include <linux/ioctl32.h> /* for (un)register_ioctl32_conversion */ |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #define COMEDI32_CHANINFO _IOR(CIO, 3, comedi32_chaninfo) | 40 | #define COMEDI32_CHANINFO _IOR(CIO, 3, struct comedi32_chaninfo_struct) |
41 | #define COMEDI32_RANGEINFO _IOR(CIO, 8, (struct comedi32_rangeinfo_struct)) | 41 | #define COMEDI32_RANGEINFO _IOR(CIO, 8, struct comedi32_rangeinfo_struct) |
42 | /* N.B. COMEDI32_CMD and COMEDI_CMD ought to use _IOWR, not _IOR. | 42 | /* N.B. COMEDI32_CMD and COMEDI_CMD ought to use _IOWR, not _IOR. |
43 | * It's too late to change it now, but it only affects the command number. */ | 43 | * It's too late to change it now, but it only affects the command number. */ |
44 | #define COMEDI32_CMD _IOR(CIO, 9, (struct comedi32_cmd_struct)) | 44 | #define COMEDI32_CMD _IOR(CIO, 9, struct comedi32_cmd_struct) |
45 | /* N.B. COMEDI32_CMDTEST and COMEDI_CMDTEST ought to use _IOWR, not _IOR. | 45 | /* N.B. COMEDI32_CMDTEST and COMEDI_CMDTEST ought to use _IOWR, not _IOR. |
46 | * It's too late to change it now, but it only affects the command number. */ | 46 | * It's too late to change it now, but it only affects the command number. */ |
47 | #define COMEDI32_CMDTEST _IOR(CIO, 10, (struct comedi32_cmd_struct)) | 47 | #define COMEDI32_CMDTEST _IOR(CIO, 10, struct comedi32_cmd_struct) |
48 | #define COMEDI32_INSNLIST _IOR(CIO, 11, (struct comedi32_insnlist_struct)) | 48 | #define COMEDI32_INSNLIST _IOR(CIO, 11, struct comedi32_insnlist_struct) |
49 | #define COMEDI32_INSN _IOR(CIO, 12, (struct comedi32_insn_struct)) | 49 | #define COMEDI32_INSN _IOR(CIO, 12, struct comedi32_insn_struct) |
50 | 50 | ||
51 | struct comedi32_chaninfo_struct { | 51 | struct comedi32_chaninfo_struct { |
52 | unsigned int subdev; | 52 | unsigned int subdev; |
@@ -123,7 +123,7 @@ static int translated_ioctl(struct file *file, unsigned int cmd, | |||
123 | /* Handle 32-bit COMEDI_CHANINFO ioctl. */ | 123 | /* Handle 32-bit COMEDI_CHANINFO ioctl. */ |
124 | static int compat_chaninfo(struct file *file, unsigned long arg) | 124 | static int compat_chaninfo(struct file *file, unsigned long arg) |
125 | { | 125 | { |
126 | struct comedi_chaninfo_struct __user *chaninfo; | 126 | struct comedi_chaninfo __user *chaninfo; |
127 | struct comedi32_chaninfo_struct __user *chaninfo32; | 127 | struct comedi32_chaninfo_struct __user *chaninfo32; |
128 | int err; | 128 | int err; |
129 | union { | 129 | union { |