From patchwork Fri Jan 8 12:32:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 564758 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 1D6C81402D8 for ; Fri, 8 Jan 2016 23:35:27 +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=vXzhcGAO; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932136AbcAHMfU (ORCPT ); Fri, 8 Jan 2016 07:35:20 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:33658 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754907AbcAHMdk (ORCPT ); Fri, 8 Jan 2016 07:33:40 -0500 Received: by mail-pf0-f174.google.com with SMTP id e65so9442694pfe.0 for ; Fri, 08 Jan 2016 04:33:39 -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=bFM3p6/Kwx4LPXVs2ZPOa3vfF9FJbs3zrRK8mLCtruY=; b=vXzhcGAOwciO4se6d/Wh0exu5+8mV+SSvEn+myQ3qWL8cf9OR230p8G86JSW3Tj6H4 CrZyztSt271ua+qg5VMjC1thUP+N2g3+nwX5a8s5SEr2/X7PZSHLOP3KlVE/z8YK2uAg nRKrK7OsDDO0h80Ib4YAsY3kugOfDGd6yP/kPiwhsZxKaHbNqcMyEQ8VNZOzrb4WEFsr roP0E1DQdmK9X+uVyA5FWJVHarmYtmfJig5jzrhdpbmMKygnGA3v6JfVzvwgcVHaSV5I doseQbk9dA2lZCe+L94wu2TWnsDSxN5xIWLrkCH+ZtRCQMNnA1vIOXT2NEFvg0r+mzbf +xHQ== 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=bFM3p6/Kwx4LPXVs2ZPOa3vfF9FJbs3zrRK8mLCtruY=; b=P5LNjONdhjPTPhHXXNVqT6FvUKsNQhZdMc0T14wLeuUW5lprgzApk8b5VmsOOcJBTx m+O2I/4K/xAd0xgOGdcLGeYGlw0xSnVAXKaI1EuF1VxjpbGxKWu9usaEaztTbT2jNFrM y1bLsIMjgMaMKxPS/d0RJn4Mx2BBeHl/9yEEHclw68F1Tf2lEkXGP2jFrdzAhvVfSucL fU9mm9kbL1hWWmDKu7Cj2Rg2Fhz+pwh0uReadPdqOIMoEsptfJLF5wrc1hBlIb9Nl8+U u3ZREWB/6gIY4JGnnBaYMNRuuxWPF8q8D3jeA044sb0nRghfiRxH9wwyQGdkotuCz10L sYtw== X-Gm-Message-State: ALoCoQl4+rgCGdWexl7ieRJx9s/JmEHns8M79hvZrO+JnjOaWHmSgbm/fizrBCnUsUeEpO15ADT8YvIBv0pBIePxxUI1BlLxmw== X-Received: by 10.98.74.202 with SMTP id c71mr3951697pfj.14.1452256419500; Fri, 08 Jan 2016 04:33:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jan 2016 04:33:38 -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 4/7] isdn: eicon: mntfunc: Silence frame size warning Date: Fri, 8 Jan 2016 05:32:52 -0700 Message-Id: <1452256375-24223-5-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/mntfunc.c: In function 'connect_didd': drivers/isdn/hardware/eicon/mntfunc.c:112: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/mntfunc.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c index 1cd9aff..4c25f30 100644 --- a/drivers/isdn/hardware/eicon/mntfunc.c +++ b/drivers/isdn/hardware/eicon/mntfunc.c @@ -77,9 +77,13 @@ static int __init 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_DADAPTER) { /* DADAPTER found */ @@ -91,8 +95,10 @@ static int __init connect_didd(void) req.didd_notify.info.callback = (void *)didd_callback; req.didd_notify.info.context = NULL; DAdapter.request((ENTITY *)&req); - if (req.didd_notify.e.Rc != 0xff) - return (0); + if (req.didd_notify.e.Rc != 0xff) { + dadapter = 0; + goto out; + } notify_handle = req.didd_notify.info.handle; /* Register MAINT (me) */ req.didd_add_adapter.e.Req = 0; @@ -101,13 +107,18 @@ static int __init connect_didd(void) req.didd_add_adapter.info.descriptor = (void *) &MaintDescriptor; DAdapter.request((ENTITY *)&req); - if (req.didd_add_adapter.e.Rc != 0xff) - return (0); + if (req.didd_add_adapter.e.Rc != 0xff) { + dadapter = 0; + goto out; + } } else if ((DIDD_Table[x].type > 0) && (DIDD_Table[x].type < 16)) { diva_mnt_add_xdi_adapter(&DIDD_Table[x]); } } + +out: + kfree(DIDD_Table); return (dadapter); }