diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 20:05:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 20:05:59 +0200 |
| commit | 0f8b1a0204a12441cddbbf5be31e6338e0b8da1c (patch) | |
| tree | 7a546266d24908269049bde5cb40aade4b45b06a /drivers/block/rsxx/rsxx.h | |
| parent | rtmutex-tester: fix mode of sysfs files (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-0f8b1a0204a12441cddbbf5be31e6338e0b8da1c.tar.xz linux-0f8b1a0204a12441cddbbf5be31e6338e0b8da1c.zip | |
Merge v3.9-rc5 into driver-core-next
We want the fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/block/rsxx/rsxx.h')
| -rw-r--r-- | drivers/block/rsxx/rsxx.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/rsxx/rsxx.h b/drivers/block/rsxx/rsxx.h index 2e50b65902b7..24ba3642bd89 100644 --- a/drivers/block/rsxx/rsxx.h +++ b/drivers/block/rsxx/rsxx.h @@ -27,15 +27,17 @@ /*----------------- IOCTL Definitions -------------------*/ +#define RSXX_MAX_DATA 8 + struct rsxx_reg_access { __u32 addr; __u32 cnt; __u32 stat; __u32 stream; - __u32 data[8]; + __u32 data[RSXX_MAX_DATA]; }; -#define RSXX_MAX_REG_CNT (8 * (sizeof(__u32))) +#define RSXX_MAX_REG_CNT (RSXX_MAX_DATA * (sizeof(__u32))) #define RSXX_IOC_MAGIC 'r' |