Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 111758
b: refs/heads/master
c: 4d5392c
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed Sep 23, 2008
1 parent 0b0f213 commit 18eb3e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2cdc55751c33829f00510e0104562d0f8d8a9b85
refs/heads/master: 4d5392cc4de3403d71b929f39f3bc659db029ad1
4 changes: 4 additions & 0 deletions trunk/drivers/isdn/capi/kcapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -828,15 +828,18 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
return -ESRCH;
if (card->load_firmware == NULL) {
printk(KERN_DEBUG "kcapi: load: no load function\n");
capi_ctr_put(card);
return -ESRCH;
}

if (ldef.t4file.len <= 0) {
printk(KERN_DEBUG "kcapi: load: invalid parameter: length of t4file is %d ?\n", ldef.t4file.len);
capi_ctr_put(card);
return -EINVAL;
}
if (ldef.t4file.data == NULL) {
printk(KERN_DEBUG "kcapi: load: invalid parameter: dataptr is 0\n");
capi_ctr_put(card);
return -EINVAL;
}

Expand All @@ -849,6 +852,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)

if (card->cardstate != CARD_DETECTED) {
printk(KERN_INFO "kcapi: load: contr=%d not in detect state\n", ldef.contr);
capi_ctr_put(card);
return -EBUSY;
}
card->cardstate = CARD_LOADING;
Expand Down

0 comments on commit 18eb3e8

Please sign in to comment.