diff options
| author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-03-11 19:15:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 11:40:54 -0400 |
| commit | f754e913e51709b7d842a9c5e17184198e83b2c8 (patch) | |
| tree | 77f023e3ec0ff80537022bf4f83bf8d7bfcd35c4 /drivers | |
| parent | c3f14cf924c7d97a89d505bdc0a06cf0d8efcdf6 (diff) | |
| download | linux-stable-f754e913e51709b7d842a9c5e17184198e83b2c8.tar.gz linux-stable-f754e913e51709b7d842a9c5e17184198e83b2c8.tar.bz2 linux-stable-f754e913e51709b7d842a9c5e17184198e83b2c8.zip | |
driver: isdn: hisax: remove cast for kmalloc/kzalloc return value
remove cast for kmalloc/kzalloc return value.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/isdn/hisax/fsm.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hisax/hfc_sx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/fsm.c b/drivers/isdn/hisax/fsm.c index 1bb291021fdb..c7a94713e9ec 100644 --- a/drivers/isdn/hisax/fsm.c +++ b/drivers/isdn/hisax/fsm.c @@ -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; diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c index 90f34ae2b80f..dc4574f735ef 100644 --- a/drivers/isdn/hisax/hfc_sx.c +++ b/drivers/isdn/hisax/hfc_sx.c @@ -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"); |