Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368236
b: refs/heads/master
c: f754e91
h: refs/heads/master
v: v3
  • Loading branch information
Zhang Yanfei authored and David S. Miller committed Mar 12, 2013
1 parent 4effbea commit d08947e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c3f14cf924c7d97a89d505bdc0a06cf0d8efcdf6
refs/heads/master: f754e913e51709b7d842a9c5e17184198e83b2c8
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/hisax/fsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount)
{
int i;

fsm->jumpmatrix = (FSMFNPTR *)
fsm->jumpmatrix =
kzalloc(sizeof(FSMFNPTR) * fsm->state_count * fsm->event_count, GFP_KERNEL);
if (!fsm->jumpmatrix)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/hisax/hfc_sx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ int setup_hfcsx(struct IsdnCard *card)
release_region(cs->hw.hfcsx.base, 2);
return (0);
}
if (!(cs->hw.hfcsx.extra = (void *)
if (!(cs->hw.hfcsx.extra =
kmalloc(sizeof(struct hfcsx_extra), GFP_ATOMIC))) {
release_region(cs->hw.hfcsx.base, 2);
printk(KERN_WARNING "HFC-SX: unable to allocate memory\n");
Expand Down

0 comments on commit d08947e

Please sign in to comment.