diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-07 08:12:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-09-07 08:12:49 -0700 |
| commit | 003e16bb4394886d1adcf01b4a23a6ad8240c2b9 (patch) | |
| tree | 2dc368114ce060075df7564e2b97266e225eb751 /include/linux | |
| parent | eddef4feb4369777e379668756cefa4bf2bcf43c (diff) | |
Fix more ioctl _IOR/_IOW misusage.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/capi.h | 4 | ||||
| -rw-r--r-- | include/linux/i8k.h | 4 | ||||
| -rw-r--r-- | include/linux/toshiba.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/capi.h b/include/linux/capi.h index f474920a7541..501ea6d59ae6 100644 --- a/include/linux/capi.h +++ b/include/linux/capi.h @@ -36,7 +36,7 @@ typedef struct capi_register_params { /* CAPI_REGISTER */ #define CAPI_MANUFACTURER_LEN 64 -#define CAPI_GET_MANUFACTURER _IOWR('C',0x06,CAPI_MANUFACTURER_LEN) +#define CAPI_GET_MANUFACTURER _IOWR('C',0x06,int) /* broken: wanted size 64 (CAPI_MANUFACTURER_LEN) */ /* * CAPI_GET_VERSION @@ -56,7 +56,7 @@ typedef struct capi_version { */ #define CAPI_SERIAL_LEN 8 -#define CAPI_GET_SERIAL _IOWR('C',0x08, CAPI_SERIAL_LEN) +#define CAPI_GET_SERIAL _IOWR('C',0x08,int) /* broken: wanted size 8 (CAPI_SERIAL_LEN) */ /* * CAPI_GET_PROFILE diff --git a/include/linux/i8k.h b/include/linux/i8k.h index 8ae0873f6eaa..1c45ba505115 100644 --- a/include/linux/i8k.h +++ b/include/linux/i8k.h @@ -20,8 +20,8 @@ #define I8K_PROC "/proc/i8k" #define I8K_PROC_FMT "1.0" -#define I8K_BIOS_VERSION _IOR ('i', 0x80, 4) -#define I8K_MACHINE_ID _IOR ('i', 0x81, 16) +#define I8K_BIOS_VERSION _IOR ('i', 0x80, int) /* broken: meant 4 bytes */ +#define I8K_MACHINE_ID _IOR ('i', 0x81, int) /* broken: meant 16 bytes */ #define I8K_POWER_STATUS _IOR ('i', 0x82, size_t) #define I8K_FN_STATUS _IOR ('i', 0x83, size_t) #define I8K_GET_TEMP _IOR ('i', 0x84, size_t) diff --git a/include/linux/toshiba.h b/include/linux/toshiba.h index 8865b6bb152d..916e5e3a699b 100644 --- a/include/linux/toshiba.h +++ b/include/linux/toshiba.h @@ -22,7 +22,7 @@ #define TOSH_PROC "/proc/toshiba" #define TOSH_DEVICE "/dev/toshiba" -#define TOSH_SMM _IOWR('t', 0x90, 24) +#define TOSH_SMM _IOWR('t', 0x90, int) /* broken: meant 24 bytes */ typedef struct { unsigned int eax; |