Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-27 02:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: comedi: fix 64bit build errors

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman 2009-03-20 21:34:38 -07:00
parent 180027136b
commit 0191492309
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/comedi_compat32.c
View File

@ -37,16 +37,16 @@
#include <linux/ioctl32.h> /* for (un)register_ioctl32_conversion */ #include <linux/ioctl32.h> /* for (un)register_ioctl32_conversion */
#endif #endif
#define COMEDI32_CHANINFO _IOR(CIO, 3, comedi32_chaninfo) #define COMEDI32_CHANINFO _IOR(CIO, 3, struct comedi32_chaninfo_struct)
#define COMEDI32_RANGEINFO _IOR(CIO, 8, (struct comedi32_rangeinfo_struct)) #define COMEDI32_RANGEINFO _IOR(CIO, 8, struct comedi32_rangeinfo_struct)
/* N.B. COMEDI32_CMD and COMEDI_CMD ought to use _IOWR, not _IOR. /* N.B. COMEDI32_CMD and COMEDI_CMD ought to use _IOWR, not _IOR.
* It's too late to change it now, but it only affects the command number. */ * It's too late to change it now, but it only affects the command number. */
#define COMEDI32_CMD _IOR(CIO, 9, (struct comedi32_cmd_struct)) #define COMEDI32_CMD _IOR(CIO, 9, struct comedi32_cmd_struct)
/* N.B. COMEDI32_CMDTEST and COMEDI_CMDTEST ought to use _IOWR, not _IOR. /* N.B. COMEDI32_CMDTEST and COMEDI_CMDTEST ought to use _IOWR, not _IOR.
* It's too late to change it now, but it only affects the command number. */ * It's too late to change it now, but it only affects the command number. */
#define COMEDI32_CMDTEST _IOR(CIO, 10, (struct comedi32_cmd_struct)) #define COMEDI32_CMDTEST _IOR(CIO, 10, struct comedi32_cmd_struct)
#define COMEDI32_INSNLIST _IOR(CIO, 11, (struct comedi32_insnlist_struct)) #define COMEDI32_INSNLIST _IOR(CIO, 11, struct comedi32_insnlist_struct)
#define COMEDI32_INSN _IOR(CIO, 12, (struct comedi32_insn_struct)) #define COMEDI32_INSN _IOR(CIO, 12, struct comedi32_insn_struct)
struct comedi32_chaninfo_struct { struct comedi32_chaninfo_struct {
unsigned int subdev; unsigned int subdev;
@ -123,7 +123,7 @@ static int translated_ioctl(struct file *file, unsigned int cmd,
/* Handle 32-bit COMEDI_CHANINFO ioctl. */ /* Handle 32-bit COMEDI_CHANINFO ioctl. */
static int compat_chaninfo(struct file *file, unsigned long arg) static int compat_chaninfo(struct file *file, unsigned long arg)
{ {
struct comedi_chaninfo_struct __user *chaninfo; struct comedi_chaninfo __user *chaninfo;
struct comedi32_chaninfo_struct __user *chaninfo32; struct comedi32_chaninfo_struct __user *chaninfo32;
int err; int err;
union { union {