From patchwork Fri Jan 8 12:32:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 564754 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 855991402A1 for ; Fri, 8 Jan 2016 23:33:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=haVRl8on; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754873AbcAHMdh (ORCPT ); Fri, 8 Jan 2016 07:33:37 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35571 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754842AbcAHMdf (ORCPT ); Fri, 8 Jan 2016 07:33:35 -0500 Received: by mail-pa0-f51.google.com with SMTP id ho8so21068578pac.2 for ; Fri, 08 Jan 2016 04:33:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MCWY+j+J0kjL9LtIvxuc0ylZ77iILO6AbLnrdRH/Rik=; b=haVRl8onQqTqROVg/TazOguGkS4iIVVuByWVMwhGXLmzpW1J64HA2JewaQB3MwJOFY ll8zfnLDr8k73Jmb8NA1t3JY/AYZUs/QKHM/cgaHVrifvqAb4Iv5vFTIi8weKkgPJa3N B0vj3ckh8FXK5N6prjvlIaKdfeIIEKFeChEPmxy8ohwbb973DJP2Vit9GNUX9Ab7Qh08 xGMNgfEUBxjAzSOrALR54MHuLKcUnhiu41ynrH0nqlKLGzD8IbmuKQN+lGEaaP+UTzMe y+WJeP84tmz3Rw+j+z5LSfDHgjysXnysoXHGMCJnlGZxD7cE/LUg5lyLWT5jqdzh2k12 oiqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MCWY+j+J0kjL9LtIvxuc0ylZ77iILO6AbLnrdRH/Rik=; b=A4+/0UVibEr0CmlqlHn6SqtX4sS6WlaHwWcHQdVhJDIx2QwX625UkAALT29VNurihI ABs3UmyB6G17vWJMvnNbvn5vPvlRr5Ff3vx2c3FmlMVr78W04LRjgrBoKfH4lXNN1Qo/ WaIcLUxWDukpD6kjEmg2OH4hbljUpsBtnAC53nCeXCqtX9PPBDae2mAfBfCg/5Znes55 3ogzbOu6hRTq+APl3KjqcmftJHgVEhYRNgRll0eNeGDrVjS6o4hCpzoL9OU8iHetUscv N3a3Y5uZpejIxecTphPHZzvz2Ls7pE+oYjdEF3Ggx7oiAoi/jgZApuOaU0jQsEtRtd9+ wZbQ== X-Gm-Message-State: ALoCoQm46qSGH5tauSd5ukL6GeZV9XI0HMHr+sFtBmN4Pe5M4kkmy4CikugNU7Zo545Rv3TPANo1G40r/lnY00Qd+6zFTq443g== X-Received: by 10.66.162.9 with SMTP id xw9mr158352896pab.46.1452256414488; Fri, 08 Jan 2016 04:33:34 -0800 (PST) Received: from localhost.localdomain (host-174-45-44-32.hln-mt.client.bresnan.net. [174.45.44.32]) by smtp.gmail.com with ESMTPSA id o67sm4614514pfa.58.2016.01.08.04.33.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 04:33:33 -0800 (PST) From: tim.gardner@canonical.com To: Armin Schindler , Karsten Keil , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tim Gardner Subject: [PATCH v4.4-rc8 2/7] isdn: eicon: capifunc: Silence frame size warning Date: Fri, 8 Jan 2016 05:32:50 -0700 Message-Id: <1452256375-24223-3-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452256375-24223-1-git-send-email-tim.gardner@canonical.com> References: <1452256375-24223-1-git-send-email-tim.gardner@canonical.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tim Gardner 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 Cc: Karsten Keil Signed-off-by: Tim Gardner --- 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); }