Messages in this thread Patch in this message | | | From | tim.gardner@canonica ... | Subject | [PATCH v4.4-rc8 2/7] isdn: eicon: capifunc: Silence frame size warning | Date | Fri, 8 Jan 2016 05:32:50 -0700 |
| |
From: Tim Gardner <tim.gardner@canonical.com>
drivers/isdn/hardware/eicon/capifunc.c: In function 'divacapi_connect_didd': drivers/isdn/hardware/eicon/capifunc.c:1094:1: warning: the frame size of 1152 bytes is larger than 1024 bytes [-Wframe-larger-than=]
gcc version 5.3.1 20151219 (Ubuntu 5.3.1-4ubuntu1)
Cc: Armin Schindler <mac@melware.de> Cc: Karsten Keil <isdn@linux-pingi.de> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/isdn/hardware/eicon/capifunc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c index 7a0bdbd..5fb441f 100644 --- a/drivers/isdn/hardware/eicon/capifunc.c +++ b/drivers/isdn/hardware/eicon/capifunc.c @@ -1053,9 +1053,13 @@ static int divacapi_connect_didd(void) int x = 0; int dadapter = 0; IDI_SYNC_REQ req; - DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; + DESCRIPTOR *DIDD_Table; - DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); + DIDD_Table = kcalloc(MAX_DESCRIPTORS, sizeof(*DIDD_Table), GFP_KERNEL); + if (!DIDD_Table) + goto out; + + DIVA_DIDD_Read(DIDD_Table, MAX_DESCRIPTORS * sizeof(*DIDD_Table)); for (x = 0; x < MAX_DESCRIPTORS; x++) { if (DIDD_Table[x].type == IDI_DIMAINT) { /* MAINT found */ @@ -1077,7 +1081,8 @@ static int divacapi_connect_didd(void) DAdapter.request((ENTITY *)&req); if (req.didd_notify.e.Rc != 0xff) { stop_dbg(); - return (0); + dadapter = 0; + goto out; } notify_handle = req.didd_notify.info.handle; } @@ -1090,6 +1095,8 @@ static int divacapi_connect_didd(void) stop_dbg(); } +out: + kfree(DIDD_Table); return (dadapter); } -- 1.9.1
| |