diff options
| author | Adrian Bunk | 2006-02-03 23:49:49 +0100 |
|---|---|---|
| committer | Adrian Bunk | 2006-02-03 23:49:49 +0100 |
| commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
| tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /drivers/isdn | |
| parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hisax/hisax.h | 2 | ||||
| -rw-r--r-- | drivers/isdn/sc/ioctl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 1b85ce166af8..11fe537e2f6f 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -216,7 +216,7 @@ struct Layer1 { #define GROUP_TEI 127 #define TEI_SAPI 63 #define CTRL_SAPI 0 -#define PACKET_NOACK 250 +#define PACKET_NOACK 7 /* Layer2 Flags */ diff --git a/drivers/isdn/sc/ioctl.c b/drivers/isdn/sc/ioctl.c index 3314a5a19854..94c9afb7017c 100644 --- a/drivers/isdn/sc/ioctl.c +++ b/drivers/isdn/sc/ioctl.c @@ -71,14 +71,14 @@ int sc_ioctl(int card, scs_ioctl *data) /* * Get the SRec from user space */ - if (copy_from_user(srec, data->dataptr, sizeof(srec))) { + if (copy_from_user(srec, data->dataptr, SCIOC_SRECSIZE)) { kfree(rcvmsg); kfree(srec); return -EFAULT; } status = send_and_receive(card, CMPID, cmReqType2, cmReqClass0, cmReqLoadProc, - 0, sizeof(srec), srec, rcvmsg, SAR_TIMEOUT); + 0, SCIOC_SRECSIZE, srec, rcvmsg, SAR_TIMEOUT); kfree(rcvmsg); kfree(srec); |