diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-14 15:05:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-14 15:05:39 -0400 |
| commit | 14cee8e377c09dc887047b3a322c71f45de7f0c0 (patch) | |
| tree | ea00760072953a797e6d42ef0ce252cd9556d937 /include/linux | |
| parent | f787d6c8dd52ded9874cbbc447a32515c80fa2bf (diff) | |
| parent | 86f8ef2c4802ac9dbe0c8c1c12670bd915a13013 (diff) | |
Merge branch 'isdn'
Tilman Schmidt says:
====================
Coverity patches for drivers/isdn
Here's a series of patches for the ISDN CAPI subsystem and the
Gigaset ISDN driver.
Patches 1 to 7 are specific fixes for Coverity warnings.
Patches 8 to 11 fix related problems with the handling of invalid
CAPI command codes I noticed while working on this.
Patch 12 fixes an unrelated problem I noticed during the subsequent
regression tests.
It would be great if these could still be merged.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kernelcapi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h index 9be37da93680..e985ba679c4a 100644 --- a/include/linux/kernelcapi.h +++ b/include/linux/kernelcapi.h @@ -41,7 +41,7 @@ u16 capi20_get_manufacturer(u32 contr, u8 buf[CAPI_MANUFACTURER_LEN]); u16 capi20_get_version(u32 contr, struct capi_version *verp); u16 capi20_get_serial(u32 contr, u8 serial[CAPI_SERIAL_LEN]); u16 capi20_get_profile(u32 contr, struct capi_profile *profp); -int capi20_manufacturer(unsigned int cmd, void __user *data); +int capi20_manufacturer(unsigned long cmd, void __user *data); #define CAPICTR_UP 0 #define CAPICTR_DOWN 1 |