From 4effbea31f3490a28f5636c1985c50b4e3a14a72 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Mon, 11 Mar 2013 19:13:47 +0000 Subject: [PATCH] --- yaml --- r: 368235 b: refs/heads/master c: c3f14cf924c7d97a89d505bdc0a06cf0d8efcdf6 h: refs/heads/master i: 368233: d901c7b2f3adf229fcff35e3f1c7b5a66bd1e0f1 368231: b3767f809af94387e067c980e95df299ef5d0d45 v: v3 --- [refs] | 2 +- trunk/drivers/isdn/capi/capidrv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f24b39453d1e..0fa926c22a5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3871c3876f8084a2f40ba3c3fc20a6bb5754d88d +refs/heads/master: c3f14cf924c7d97a89d505bdc0a06cf0d8efcdf6 diff --git a/trunk/drivers/isdn/capi/capidrv.c b/trunk/drivers/isdn/capi/capidrv.c index 832bc807ed20..cc9f1927a322 100644 --- a/trunk/drivers/isdn/capi/capidrv.c +++ b/trunk/drivers/isdn/capi/capidrv.c @@ -469,8 +469,7 @@ static int capidrv_add_ack(struct capidrv_ncci *nccip, { struct ncci_datahandle_queue *n, **pp; - n = (struct ncci_datahandle_queue *) - kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC); + n = kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC); if (!n) { printk(KERN_ERR "capidrv: kmalloc ncci_datahandle failed\n"); return -1;