git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hysdn
/
hycapi.c
diff --git
a/drivers/isdn/hysdn/hycapi.c
b/drivers/isdn/hysdn/hycapi.c
index
acc1d3c
..
b2ae4ec
100644
(file)
--- a/
drivers/isdn/hysdn/hycapi.c
+++ b/
drivers/isdn/hysdn/hycapi.c
@@
-31,7
+31,7
@@
static char hycapi_revision[]="$Revision: 1.8.6.4 $";
unsigned int hycapi_enable = 0xffffffff;
static char hycapi_revision[]="$Revision: 1.8.6.4 $";
unsigned int hycapi_enable = 0xffffffff;
-
MODULE_PARM(hycapi_enable, "i"
);
+
module_param(hycapi_enable, uint, 0
);
typedef struct _hycapi_appl {
unsigned int ctrl_mask;
typedef struct _hycapi_appl {
unsigned int ctrl_mask;
@@
-523,7
+523,7
@@
New nccis are created if necessary.
*******************************************************************/
void
*******************************************************************/
void
-hycapi_rx_capipkt(hysdn_card * card, u
char * buf, word
len)
+hycapi_rx_capipkt(hysdn_card * card, u
nsigned char *buf, unsigned short
len)
{
struct sk_buff *skb;
hycapictrl_info *cinfo = card->hyctrlinfo;
{
struct sk_buff *skb;
hycapictrl_info *cinfo = card->hyctrlinfo;
@@
-745,12
+745,11
@@
hycapi_capi_create(hysdn_card *card)
return 1;
}
if (!card->hyctrlinfo) {
return 1;
}
if (!card->hyctrlinfo) {
- cinfo =
(hycapictrl_info *) km
alloc(sizeof(hycapictrl_info), GFP_ATOMIC);
+ cinfo =
kz
alloc(sizeof(hycapictrl_info), GFP_ATOMIC);
if (!cinfo) {
printk(KERN_WARNING "HYSDN: no memory for capi-ctrl.\n");
return -ENOMEM;
}
if (!cinfo) {
printk(KERN_WARNING "HYSDN: no memory for capi-ctrl.\n");
return -ENOMEM;
}
- memset(cinfo, 0, sizeof(hycapictrl_info));
card->hyctrlinfo = cinfo;
cinfo->card = card;
spin_lock_init(&cinfo->lock);
card->hyctrlinfo = cinfo;
cinfo->card = card;
spin_lock_init(&cinfo->lock);