From patchwork Thu May 3 22:11:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Lesiak X-Patchwork-Id: 908334 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=none (p=none dis=none) header.from=licor.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=licor.onmicrosoft.com header.i=@licor.onmicrosoft.com header.b="JfsdD+xn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40cTs973VMz9s4r for ; Fri, 4 May 2018 08:12:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750965AbeECWMN (ORCPT ); Thu, 3 May 2018 18:12:13 -0400 Received: from mail-co1nam03on0095.outbound.protection.outlook.com ([104.47.40.95]:36016 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750829AbeECWML (ORCPT ); Thu, 3 May 2018 18:12:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=licor.onmicrosoft.com; s=selector1-licor-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+Uiz2Lhgqukf6A33JHiRomyb/ABieOuSY9h+TowaM9s=; b=JfsdD+xn7h5zzZAVxHIA3MMEJ3WQQr9cXIcbuEOAqbgWlk0qWacE0nTVda/c4E5wSkRN1qcoAiY2hCMgqe1ba8mxxBeRIncv6/ClRJvYQbPufvrCQRm1LJV+znR5A1FtONoBZOtoSnRzU7CEpsi3M+94TtRrh47y5mEfoGw4IHw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=chris.lesiak@licor.com; Received: from bee.local (208.82.105.200) by BN6PR08MB3394.namprd08.prod.outlook.com (2603:10b6:405:66::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.18; Thu, 3 May 2018 22:12:08 +0000 From: Chris Lesiak To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Chris Lesiak Subject: [PATCH] gpiolib: Fix logic for driver override Date: Thu, 3 May 2018 17:11:18 -0500 Message-Id: <20180503221118.20754-1-chris.lesiak@licor.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 X-Originating-IP: [208.82.105.200] X-ClientProxiedBy: DM5PR15CA0044.namprd15.prod.outlook.com (2603:10b6:4:4b::30) To BN6PR08MB3394.namprd08.prod.outlook.com (2603:10b6:405:66::21) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN6PR08MB3394; X-Microsoft-Exchange-Diagnostics: 1; BN6PR08MB3394; 3:3ZiPsFq/2aDy2kpaIwnZySMww7AUS9TQZUav7b0ALSbUNX6S2tWFAsIM6ojM8nrivBJr/bHuYfdEbrASD6k37O1aFRWwRkVaT6x+zGsxkP0K8WFdd5IYUpi4dbAozGdrBewz8Ok9Ex3+n/1HYvMPo2Ltsr5RWzWia0cBvAeG12QOszvlIOjrNvujZACQqp/iMLTPkXsTlnr1S3LJgH6tZsu+pGs5JwYqZzeZPKu4GYCcfBEg91cxlOQr1nXFzVZS; 25:cj8LnqK3LplSAn/Cdkg+mbR2eyBBodARg0x365vE8TTcYMeWSgIT+Gdnf79vQ4K/bNdD7KuO9o8075o+C36cHlScEqP9SxWGhF4IMZ6Dny7hmazYXGiMO9ZQ4QQiWL6g2YUfaQ1eBvTWEo+y90Sg79taIjARtSAJ4heT/l5NKINdI8SpP7FKawS/UWZKT4ThMPtQ1lCQVcF6W0sPhQqTCjLb3mb1nNeeu/88KiEieEvYs276N9tpCmPGxNKc2VC1EIhQF0rOZL2qTrXU+olpyLeYAItKO4QC+iKbxgFc2ot4iX+lVsHFlTt8MVqW+n5VterYGHAGS8zIChbPh6qC3Q==; 31:4XvQ02RDJMGwKNuElxYAd9iBx8SXSCoCaKRTRL7FdGgrS5uv9qh7KXnOsbrGRw0mdM1GsImy8sPinjkGVkCBJEJGIDWI0gKsHM26SXl803dTIMNY38RDAvL+d19m9yzI0kRN2nbp4hdA++GhP4zRASASsW+26y8ftTM2vs5j2P9i3lfHrb7dQJpu/zFjTJh4GZkahClZeMOl60fJerymJfPET1zleKuEgyNJzNrmfes= X-MS-TrafficTypeDiagnostic: BN6PR08MB3394: X-Microsoft-Exchange-Diagnostics: 1; BN6PR08MB3394; 20:bGTrg43tSwIxjf+Lbzn5+qo4vmuq1wZBQLaYYsJL/cfAW7azshj4fgm3ULOrgEh04dck0DaAJNsbKSCziqnHYM2SsttWZe4gA0C4dhxfGdjn3722zTyMtdysVZv/x+go/y0aenCAIekYYblaztRcAROzGbImB8pqwjK6Z7XFoIIZqD8bYfBsg0l1CLL0oCbaJfbwpP5PIuH4ENrx8RdgvrzOrZrmQtgMJQLIJOSbtQsNvwpLY/PZ2iOjywka/9Dfyn32yQAkmYv3A4EpDQqgB7jbPj+76cr+Amg/YMeViLeuJ2iI/XBrXsQfIMPVeGJtFmlinKbVlHAMql0UHOG9N5lK0JaLP5aaFtLDb3FkG40jyCJIdVBlvr18Z+ISTccKHMVvmgam6QJ7YgNZ/NB0XYO3Ku+wxsEFaCWuApEkou/66FIrsldo358jCjlGk9L7haKRK3pRdMydgAy0y4U2nNBvEh/G1Z6arncM3gcQ2fCPta3vG21kHdQijGmj/ql6; 4:1XDBDLn55PkuuwiNkyu9F4eIRx9welGOaLSfGSTkPV5RPl3I6WpZJUGcBsY/6TmdEOtOiycdg/NZDUWFdmrWW4hzTWVgP3lpieEcoDwDlhlj8M45rRQ+vFL9g8ObJMztfbwBjBOPgYPmx2gWCRvH3pnG42kxg+Egwc0yFv2LItUwwaU1gGo6jYneAn0zy8rUr+2/5b6R/6C6pCuHAUiXaahUvJjrP7RoxwV3dhBsLFMWAikIqg9O51bBsz9JDTgsbQoOaAaY+wFUJpVrrhsaNA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:BN6PR08MB3394; BCL:0; PCL:0; RULEID:; SRVR:BN6PR08MB3394; X-Forefront-PRVS: 066153096A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(376002)(39380400002)(396003)(346002)(39850400004)(189003)(199004)(186003)(106356001)(54906003)(105586002)(476003)(3846002)(1857600001)(305945005)(97736004)(44832011)(26005)(6486002)(956004)(1076002)(4326008)(51416003)(6116002)(16526019)(52116002)(53936002)(2351001)(2361001)(2616005)(486006)(107886003)(36756003)(48376002)(50466002)(6506007)(16586007)(386003)(5660300001)(68736007)(6916009)(50226002)(8936002)(8676002)(59450400001)(86362001)(66066001)(81156014)(2906002)(81166006)(6666003)(316002)(6512007)(47776003)(478600001)(25786009)(7736002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR08MB3394; H:bee.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: licor.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BN6PR08MB3394; 23:/DEmw+URZ3d0Pf6qea04GFo1H/Y1D4oWhiqYHyiQCwBqfeUMTisGlDn9+xGlBn2P3U7d4PX+bOpz2iqa89L87RH99K2fIO/DRtkknJ5QpZ1UQAvrn357cOKvL7ZKSKH1vV5eAEFHwip8JJ5i3mqTJc6pnkzr6AAMqe8RLq7574OSBORb+vEccCTEuA4AvrRsEmInnQzCHWCtPaAdnRHbE2x5EsYWMwlqiREXqpqytWo6cBZeLR4VpH9LcHJ343Lx2QKukyCEVXsy73GPBtOhekDUvuBAviJ7WBTs4gP1Ym4EAv53yqyWOVYqFGJUfYhV8647MBCCeYp71M/mFJlSnbSzsHELfugzcbV/5MMoRgeKgrNt8cxOaoMaN/KOy5q9ZMx/cvXFKS1qwIyjgSf9xSIna7rC2V5EACG8Likg69OoPjiSfeTIaIdSQidsusYmoJGI97JyngzL8ELTq5tK6mi/jDfRbzEqsr2yFwcup41i6HB5DtTQPfmk5LP1mljK4mS9ShvkOWWOskY/jsKdoo9WSfxzDu1g8JqCZpCJaE9cTZJk3VhUtIE1qp7X3JsUlfj+Mh3Viii1WM8SzxiUqyzaHGsGfzcIJjxKxceOXn7gMkZ35n9eE8baUPUzGzfnmF62ex7/o0SDRjXoStC0KnxWS5mEUxTbDPY6uTM1n1KQWtWv/5wscri+G/S/fFehYzo3OL9PZSGUvt7DHaNHuNKx8ZRhPqy3xduFhVV79r9iIz5YbkJSJkwKgRJfnDkOYZLKL/PjdauEoksTNjjcqyvD87scREq0Y2mY4OK3asxWKSROBwbV9zxXIqFtgk0GsTqqJ8/A8NSjnVUYrH+Hku29U8gfDw0UGL57TFjjS8sf1e+SvxTOBuX/nEJzSyO49M57QhRIqzkCI1x3D8N/G9c+ZypDpp5PyHDZuWdMjZk9Lzf6VDDU+eGUPHetmqHL35BTVwj3DGO/2zvafJ/RCB3zPBapCE2j02ORwLzN9bqzjMglYKfmGBiH97XNvvocGimTo1Q8TeyrrmhxnUORpkysO8LccbVhlarfEoOBHq22lAn/NBxVoByknD/83TimuDkNhsFLNY2GEF52NJVFh4zXdERB6VdyGpTxgIv7gU69GZ+d2CAIJOl3JPxFm5msB1HBE7WBJp2PG5wCRwFYOo0YKyJ4VkpuIemn5CR/tQFlR8MjtOVgWawFw5NzPwNBeaRps+qVSv3nqk0P7ZAOY2PcgYYFCCBo/tVrkIJc87WKCsR358vdpBi7NvRq1Ww0ILMgWBiigafYMbkTFUsjlQ== X-Microsoft-Antispam-Message-Info: cGpVS8dJo7VmtMOD4h4BTVm4Lvq24xxXIYCwBLNUPD0tq+zheLLX7Lx4sIbrFL7jbPoWaX8QFMxPDQbdsl3Iqne4n7zJOPxQx8vLgQ6jcAyK56XcAS4l5g4wNyAyW/46FJo4w/rmUDUCicgjQLHaXhUp1iZF4+Ce9BkCDC75XOgyRYs+xfBtBF+UEfYX6ix5 X-Microsoft-Exchange-Diagnostics: 1; BN6PR08MB3394; 6:F9J3mvWWm536DSNIO8IOWSoT9zfPiiIYqHbIaIf4vwvbyoQldY5NS9wuc8dML/+J3e0xcYpGZbZLgnjN7HpXWW+yC5IQ73skubSszNEabW30p3D8UwlqbGdWy/Tpm00d7BNq3GGb1wOXeHK3iIjHjlrRIhdq4LsJw2XciTh8jpk7Qupuv9grik5ETA8nBquyMvDCwxodKyXn5fTli1QgSB9qV5ineQpnqk4bH0BJ6OqPKnpbhSoaKrMI0K1dQiSXYp/jXwx2Bb2OWbN8ZYp1axM4e31IjCcWkfHekaZPNisuC3OJZ0M30IcC8KBZTmwW/AY+OhpVva42azP5OdDVlPrtL0rrH0OQUXAzOyNlfVsKUSJO42htfFNkDT5UWOPSqwyWDji7SKYj+LWAXdf3KDPQI7hTvl7RdBK257xqaH4bMQNh++q/DTK30mLaREC6Z7gsclDhxJe4E4sju2ZwEA==; 5:xg4bAXX6NaZXPFgoYpz+ujylu3l8lu4eGuyXODDRmXGaQ6SN0NLnhUB+FIvKcgEjJvxW9eQjZHE04QE0ZEJq+4v+DPD24YCkUbl/tAj/IGzImzlRbEBuay8vsaC9DBoHHG6pjTB5ZVKJetdR8tax9wrYZqUiOudLnhpLtg01GPY=; 24:Dt39sm68XtDrL9cXa/TvbruIsZVLy+f/TbC8WxMM4+NRy0KGBjAhhH/QpDMZ/TUzNqgU5168ZCyLzubJD8OTYZzZP2ivQQbnA1veG+NH1uM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR08MB3394; 7:V10u5LrALNT+9HhnZB3EepbT5RemGz7zUweR09YH2JJd4Ej6bEsPSAV+bBITsF1l1hJOvYXBLSbUw8yl1Uc0Re8PB9zubh844SAYuVtrJleOzP0mto9ouQoqqLpLaO7EirAsHfBBJIRmXtAurBkDmAFyiXJg/kdo+K0J5r9p0sQvzz8m0f31wmpm8q/zAh2uSMChFQcOJ5cPeTIQe8aT2neJM7B7WMaI/rMGh0Rso+n60HMjpQfQ3K8ktIK2Szjn X-MS-Office365-Filtering-Correlation-Id: e84f2537-3095-4056-07bc-08d5b142e976 X-OriginatorOrg: licor.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2018 22:12:08.2296 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e84f2537-3095-4056-07bc-08d5b142e976 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 48c70abd-da5a-4c6c-86cb-5e003ca01574 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR08MB3394 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Fix incorrect logic in gpiochip_irqchip_add_key(). A driver needs to override both irq_request_resources and irq_request_resources, otherwise gpiochip_irq_reqres and gpiochip_irq_relres should be used. Signed-off-by: Chris Lesiak --- drivers/gpio/gpiolib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index bdd68ff197dc..3e441879fea7 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1831,7 +1831,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, * It is possible for a driver to override this, but only if the * alternative functions are both implemented. */ - if (!irqchip->irq_request_resources && + if (!irqchip->irq_request_resources || !irqchip->irq_release_resources) { irqchip->irq_request_resources = gpiochip_irq_reqres; irqchip->irq_release_resources = gpiochip_irq_relres;