From patchwork Tue Jan 8 21:51:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Kridner X-Patchwork-Id: 1022142 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k2zJ7hdn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Z5cW3D9hz9sD9 for ; Wed, 9 Jan 2019 08:53:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729218AbfAHVxq (ORCPT ); Tue, 8 Jan 2019 16:53:46 -0500 Received: from mail-oi1-f195.google.com ([209.85.167.195]:33555 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728041AbfAHVxq (ORCPT ); Tue, 8 Jan 2019 16:53:46 -0500 Received: by mail-oi1-f195.google.com with SMTP id c206so4674443oib.0 for ; Tue, 08 Jan 2019 13:53:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mYdvvhFV2Ii47XuBARr4vAgJhD+FVvo2PCZ17OjbZQY=; b=k2zJ7hdn1nANuQvy7bJmh/Du/i203bq4v45LENcsrzoXF1zvRhlhJLZe5Ek/hpIOi3 lty6LkHpoXv5zS1IMy3BWMvbZqgrVfJElP5qYM0b7GD82LQeBHSPIG1FDHgeUR3fHQ3h E8y+gVYpDCrLnMnVedAbOKV2sEjv0VCTWH1ZPRRWIBm84PoeJ3/k31Cd2w5DfaGkWzu4 vfxNx5HJyhFFqV82x1553IgS/wRvEs8/lRc+3jBD3VCA3ZDQ9ipTDeD0lR4qSmHAgPzH NRaacu3XiA5a/XKE95KM17kBYAaDmi2D4PVx6SWloMCuOf/IzDA5KfC1VOCWHsDggNtf XThQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mYdvvhFV2Ii47XuBARr4vAgJhD+FVvo2PCZ17OjbZQY=; b=ge5dhWYbg25uHVSXhl4QLym/+InA5EHWqPEf76/hng2upRyY06qP96lnp94lY8I2rF 3Fra539nx6vOSwqWfi37thMqrqoVvTutwcjUGsGYZmainlPeaGEY/9YoUM/clO+cx3XF oUrMr0ULQwegehe5PEAT64EnjoXASMfqFddtxPRMhmZVQet+dPG9cIdwm7uWoxTtODTW PZL0A8EI5WRoqogHFSm1MRn92I4C4VM11ITzBA0I8y+BT/bmBcw6eU9RWGA/ykJqcBHq s1fmZaYvwyn+Tu9wCUBSiYadmWHVa0Hw0HCEdKK6udkNrK66JM2bATqPvIDU8DRGoJVD EWNg== X-Gm-Message-State: AJcUukesmNvgaTLqQ3JzwD9dhmf+Sw/e/YacJUVEq8wBvVXjeTacq0zj HpNDG+0hxB3fRMivIsRCiKVwjr+C X-Google-Smtp-Source: ALg8bN7CCZX1bFNhLfPEybVdqLQnSXPnePyZuGJI1Kh+PG/Q0T5+v2d0Gth8kFSXRVlhL9uezbx8zg== X-Received: by 2002:aca:b642:: with SMTP id g63mr2111267oif.195.1546984425135; Tue, 08 Jan 2019 13:53:45 -0800 (PST) Received: from tupperware.attlocal.net (76-243-180-139.lightspeed.hstntx.sbcglobal.net. [76.243.180.139]) by smtp.gmail.com with ESMTPSA id 14sm1419092otg.68.2019.01.08.13.53.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 13:53:44 -0800 (PST) From: Jason Kridner X-Google-Original-From: Jason Kridner To: linux-gpio@vger.kernel.org Cc: =?utf-8?q?Jan_Kundr=C3=A1t?= , Linus Walleij , Jason Kridner Subject: [PATCH] pinctrl: mcp23s08: spi: Fix regmap allocation for mcp23s18 Date: Tue, 8 Jan 2019 16:51:58 -0500 Message-Id: <20190108215158.16374-1-jdk@ti.com> X-Mailer: git-send-email 2.17.1 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fixes issue created by 9b3e4207661e67f04c72af15e29f74cd944f5964. It wasn't possible for one_regmap_config to be non-NULL at the point it was tested for mcp23s18 devices. Applied the same pattern of allocating one_regmap_config using devm_kmemdump() and then initializing the local regmap structure from that. Signed-off-by: Jason Kridner --- drivers/pinctrl/pinctrl-mcp23s08.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c index 22558bf29424..3b3ec4a8d602 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08.c +++ b/drivers/pinctrl/pinctrl-mcp23s08.c @@ -836,10 +836,13 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, break; case MCP_TYPE_S18: + one_regmap_config = + devm_kmemdup(dev, &mcp23x17_regmap, + sizeof(struct regmap_config), GFP_KERNEL); if (!one_regmap_config) return -ENOMEM; mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp, - &mcp23x17_regmap); + one_regmap_config); mcp->reg_shift = 1; mcp->chip.ngpio = 16; mcp->chip.label = "mcp23s18";