From patchwork Fri May 4 13:20:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Lesiak X-Patchwork-Id: 908711 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="ZKyOar49"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40ct2Y5Rhtz9s3Z for ; Fri, 4 May 2018 23:21:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751114AbeEDNVk (ORCPT ); Fri, 4 May 2018 09:21:40 -0400 Received: from mail-co1nam03on0133.outbound.protection.outlook.com ([104.47.40.133]:45620 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751107AbeEDNVi (ORCPT ); Fri, 4 May 2018 09:21:38 -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=ILXYmIsp4Dd218Ue7SJiX6zyirgNyC2wlpkUQibzVOI=; b=ZKyOar49zH8cnz681J264eA1SXwm37l/aaisufPSBflyR6D0wCACvx6AuqO5F/sC9Nocq78lDXIV4xDOKxKLkM8e5EeAYXzkwLT30UA2IgbtSRghA+XPTYeEUStyMVmNCJN9+LmDlPaFEwo/g14AZXM2DORYscK/Oj6zQBtzELo= Received: from bee.local (208.82.105.200) by DM5PR08MB3402.namprd08.prod.outlook.com (2603:10b6:4:69::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.24; Fri, 4 May 2018 13:21:36 +0000 From: Chris Lesiak To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Chris Lesiak Subject: [PATCH v2] gpiolib: Fix logic for driver override Date: Fri, 4 May 2018 08:20:16 -0500 Message-Id: <20180504132016.25687-1-chris.lesiak@licor.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180503221118.20754-1-chris.lesiak@licor.com> References: <20180503221118.20754-1-chris.lesiak@licor.com> MIME-Version: 1.0 X-Originating-IP: [208.82.105.200] X-ClientProxiedBy: DM5PR07CA0073.namprd07.prod.outlook.com (2603:10b6:4:ad::38) To DM5PR08MB3402.namprd08.prod.outlook.com (2603:10b6:4:69::22) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM5PR08MB3402; X-Microsoft-Exchange-Diagnostics: 1; DM5PR08MB3402; 3:CwZLif/UBcMruTDFcRy4E/A7Bu0JbttlR9pOxyp1uDhBgIdtA0Nv4YsduHN2Jdd9g5j61CLxpH/EIzKWCgWCTEBcLgXJClrxi+75ic0HRgtZugl7fqi+7CNQnogx3vcrMV2wuazYYNuyvc6N4NLNJdeSE08MmUDjqo68Km0Clria7MWVokCbeLPj5vqKVBCpFuwX/jYOidORQ/a07KSOJ+osMDiUvTwH4TDEyrMStL4r4cN7RXKWRSXLeFUPz6J6; 25:Lrh2Iqg/H5mLi4eIA90JjHz/17NtiI8/KWhTcOoc7mJssnGYXOd8t2xqoLcXlyOc+PvPVIRX/zgVKNSQ/Z4rwh04PWRp+2lxHW3GvIho+PC23uVy/zKZya6QC1cPN/xgrdQ55XsNwBMqehWJA2cG6g47ds1Aj0jC38GCtP9XNIz//Nut0u09d0AtigEgirPgXpOoOk+BORjbzI9KVeC2rgwPFaH8olYkOKfUYnZHReFl68UlUEzge0IbEEIIlse6a/QJQPCSz0Bw7v95nEJ+j7XRt4gT0Qm2iUAwGvlS2kGgWo0/WAGo0HqUEix929MpokW/K7BKef1ksAwW0EiWBg==; 31:QkuxPMM01bREX5GkTuT45G4MI/R+GOL/QcZ8kjvZVUb5FS0KIcszqLSGtSWflOfMJTw8ofgbH82OVDf/V9wktHeqps1JsqDjIhlTs0kw9mR2smbKOcfUv4b6jk3DZ6O0/o/4ekj7HcgW22VBKP3KxGa2goB6TZqq4zFywKpqdSI+pwrEZ0DAaxr4gNW6pTdQTTgr6fL2pVRqoqNM8FkcOdxBb6cHV6OBLAonx9x3rGk= X-MS-TrafficTypeDiagnostic: DM5PR08MB3402: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=chris.lesiak@licor.com; X-Microsoft-Exchange-Diagnostics: 1; DM5PR08MB3402; 20:ETENucLB/d7VRVFT3gJJLiRoQdric8XhKoZQ0sEtFfIy+jZIUEAef9AZuW2sIKiCs1zAgCtVvYaAJvBLdoX/0tOc7to3yw6fr01CFReZQurpN+U4ermFfPkQsXh6Cgtuc3oKP6StUc9fYp2viRua4h0GgozLmyj96uy+s9Hf+KdJeF8qyw7zr8WZ/odalB9T7XzsWmsNC5//UOWxa5BPYf25aljQf22CUPrwwALBJk1gJF59qZnLF2+Eoh31xBkNviEP4vzdSOqsfAWFGwSI2v88bNbpvj5iwNfYejmEY7nckJ8L1wngXjc7qPcKLq0GClNkRfBpdcahqhGcpQFv4Syb32B3AzERM6eYE1Qo4J5cWd9U5rdTXGVBscvsjyYR1/mQvOu+ELI7XOVbTCbJOq0JVbuGIWhIZgK3Grio62IZ7bAT+ebEzyIDeCtL4/zVex/y0PDGmfKB2V5+AtzxFEJln9Cneh+Yas/7j6slkJIl0o62btA1f+TX7dUJ+nrG; 4:yF8VuGTBaBQxO5hfZFfve1oZ/3emne0WsdW2t6IkzqGPfJQMa5k5A3SS9ruCSW+MFn0OPDEGfL9ZUEOXUmemylTctJZEMCLD7qmOfho/tsmQMay/2ac/jaHbmlvpZS9XYoBT6zLVAwZY6G9oFbLOjvh6bC8BdbmbSphr8ONlOq7se6PGm+R+bJYoAGhWI5hVSIB49dT+E7kr7BydTqyAZPAZRTQbdO2OMbKnR6wEnPZ+pY6bDG1AgwJagn6MCEyvSkm8x2m2K1I07JUSJxvwFA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(10201501046)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR08MB3402; BCL:0; PCL:0; RULEID:; SRVR:DM5PR08MB3402; X-Forefront-PRVS: 06628F7CA4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(376002)(346002)(39380400002)(39850400004)(396003)(199004)(189003)(66066001)(16586007)(50466002)(6916009)(1076002)(48376002)(106356001)(47776003)(2906002)(105586002)(956004)(2616005)(11346002)(2351001)(446003)(6116002)(44832011)(6486002)(476003)(53936002)(3846002)(107886003)(81166006)(8936002)(8676002)(81156014)(50226002)(68736007)(478600001)(6666003)(486006)(52116002)(26005)(5660300001)(316002)(16526019)(305945005)(6512007)(25786009)(4326008)(186003)(54906003)(36756003)(7736002)(76176011)(386003)(2361001)(86362001)(51416003)(6506007)(59450400001)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR08MB3402; H:bee.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: licor.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM5PR08MB3402; 23:akjn/i6JQqW6qfsrgOuWbg84FrwIFiqWSDYNqZVtxuet2gZZrLrAHi2wV+MOSZ9QETmDTMGqMKn8yIqk3ULGiwHcqhkInJtElU2QWSgW/NYU+JlcazTlIzpHG1xQGdjUN+p5t3SiJdkm2RPkW5tS+NcWqw3diA5VbNKRKrCQLOvT5TJD4jXfzpR8jFuAMZUvGcM9vZVdbZyyfUoYgTtrLO0WPx8dnglb/JjDGaVBrJdVtsMAZy+i7gPuPo9hNNC49TcgOArMzqcVY22kc9S8tpVJ3EAqOLyum3szK32oSRGFSiNEMb2MBDxjPgpOxkwZttL4XPIUOB+mJXGSyuxQTc0JYFtlvpD9370H662KbVtMfGdTljbf+B9yvDgWZUlS7O3xRGxeggT67WoK8E8MiBxygJCs9uP9dXN5AMjY6n0ADoJyqXDyoROCcXQJystza85SHoAJDGBXGoZtt0La4/Qq3jWh07Omqnq0GG39F2MZtiaM1XXwV5lvkFHaERdNXsDU5Z/V0nQ1JDVhAdDSoxkPEQl3+YoyNoN+J8D0zBEMvL0PHQW6BvTYE7n8usam+UEeBP83SDqEuLLj9pOm/8EitHIXUP1Y7gbUX9/uKjRU5nsDuA+qVZ390yNMI03gefP3nYOWtb8w5oILCKQ90Ce6+dHiPuh0pB00jshv7AlLtyD36kSmh9wVnrVZv6MvS8tAGvKxsfsZHq4JpsORqUyC033eYeOjnUzNmAVYw5ZOxe7PvTz6t15TxVlSMgbJbkdtEJOgI5WYLuenXQwV+Qzn88lizG/hz9+5inbdZS4oVAusWyrp+BoILTExE/FMqHexLzjeIHHQsBhQWEdZYymHxwpjs0iiKx5/LRDlLqpyiDveHatbDz0a6dZNZnlONmzaQtxFDOdyJS4mSvka9Lo7BXrnSw1XRDjZQC5+fkLspPR+UEbijLc0OJIlzuUGJ4cX2E4LidKHSJdVehcU1EnapCKoXux6A6+C14xYNp/wOrOIXFkiDTpU/MsUEeYbh8NLzv80+tnce+HIPLtgRVz+90gnHw00Lm7Gv3ZSRh2cfkolp2Y43x67AmoSshWKC7ELO6XbYtm4Zki31KAgbVZqVBc9HbpK1Lx3OjaPTL6ChfTKEba2kZvIYQGZ/a1Z+4XYOgEn45acRs4Yey9KuYf2oxnWVi6BNy7joesyoHjaSxaPPAafQ9v/Yf59D0jijEEj5KjQvzBinbhlsmRclfASQpkYqarzcD0rR70aF/DNW17tPXtpriI/xTCyjXbYY2u98RwIRX8t+42kXp2cd4Jb7mEW9/zOsS7VWGygzAq7w2FDZGSQe+1Je9OmIwvA X-Microsoft-Antispam-Message-Info: z18LLPGiyQ/pJ1gCexZPyEw7h9DUvEZJ8bqdEqboOxWEXxBCXvxSnZbN4wYUiAz1Vv02f88GopmUUT0Dc5z0O/KpKtw8wusJPFd+ixTal03lD/qYvrhFrt8q2HwsssSpBLvS85ARyZ5pUFnn/nfEdusdUL3VJdma4z0SoSdZDm0KHmFU5uaIYZ8nskNRZkke X-Microsoft-Exchange-Diagnostics: 1; DM5PR08MB3402; 6:DKG4SZBOxlnWsDFF6jTvmLEQQ/DYRl5GNt/QaNrumdogY6n0ZdBNvNLebMzWGOh475rypEKE1H9PRDncomy60Gz5PO1RhRS35yg/R/YEbQE8fjiHRr+pMZCvX0T+T66kTo8Gz8A57uv2gGxUYRml7WyjHiTe+2SEQ0M4pxfY5vzjGtb4WB9fkT5feftYgyPsRXa4M6+G5PFynrcoUSmBw0cSN+kQX19kHXNuhfI+5Cb9N+TkiYpyY6kxSXEVKFevgMHtFnDYWjmpdmhwJFS4RKG47hgQnfW4U/yTcROFcLFIva1/zCIcDYk2AMVn6AGZEdCLtNhj4GZ8UJuyxtl6c6/LkNlfwFotnjp2VpbpJYoz6b7BNy+WPH90xX4Mfolq2HyJOG/V5KnsufUkol8MQO5lUC/xOV39EaL4mytZmW6T8/4F8g3iTj0hvRePAMfF; 5:Vz3ktCDfT3yo4tOcVGqQIMqUzDs4s5IkjHM3KhbcP8UT00kFiEYOWtShmlqEQ05MhzOz9daNPFenM/fSBmyPd92nMPQR9d5mEu21MyCavlquYtavv1WdU+Bqz3RvMaYYfOzBUoen7xd1iiEkYHDsIo5PeK78GTHXN6ZUljOzhcA=; 24:vBiVDFBLNidnDXq8UZ7j8HjxUT+UygaXb+UPpqNdKIIDCvR8QYoxX9eYSrhcFhJVyXS8LJciQDSqRxrvAH85GeWgrBkQKzB0t/+upgzZSho= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR08MB3402; 7:fgYq6JB8cCKbH8L919W3i15XlS16tfPiTLpufM7HWgUZ2p8p3SRyrKX4FJKFtM9fhW0iBc4ADAV6MtbhTRe3tXZOhjKsQ5r+xOYsll9huZvgPHM24idc2vqolJKKmfLA9IUf6JlYH4kA3E2T4VfhklQS0ke7esataf9/VKVCugsKMhCMWdBXp/lQaBN6f2l3wJmw9G1AKsthtxzLahj7x/4hhusWM8RS/XqGdT+GKUgEjuL8wxjsJhGNyM+nsG1g X-MS-Office365-Filtering-Correlation-Id: d6bb0611-fcb4-447c-d9b9-08d5b1c1f680 X-OriginatorOrg: licor.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2018 13:21:36.3830 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d6bb0611-fcb4-447c-d9b9-08d5b1c1f680 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 48c70abd-da5a-4c6c-86cb-5e003ca01574 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR08MB3402 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_release_resources, otherwise gpiochip_irq_reqres and gpiochip_irq_relres should be used. Changed v1 -> v2: Correct repeated irq_request_resources in commit message 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;