From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1B56C433DF for ; Fri, 19 Jun 2020 14:41:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77DD221548 for ; Fri, 19 Jun 2020 14:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592577708; bh=kZ2JT7pJzNcsSRPkYpNNMCMcIXuq+V0mJeRqmsklpBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j5J63jgl25ZJmRwLB7S9ktoM0qaCwLuD3jkJdtHY39qyv997HUuyhh2qHOCKzP4Zw ClOxRj8edt/j7Cwm3fmjdZt9LYm25MtL7OFpjVk0H4BgYVGzj+dcqkPBUx4BZ9PVPM bbhLoHak/upgOHrVGmocdfO6w0Z568MhMLerkU+E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387939AbgFSOlq (ORCPT ); Fri, 19 Jun 2020 10:41:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:60492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388285AbgFSOlp (ORCPT ); Fri, 19 Jun 2020 10:41:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BE42221527; Fri, 19 Jun 2020 14:41:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592577705; bh=kZ2JT7pJzNcsSRPkYpNNMCMcIXuq+V0mJeRqmsklpBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dqub5D9qZEB4hjtAjYwlLPvR0UlCbJh2+Ux/fQC0HtmlIYBYpmpg3/ZnYduQhYOc3 5bpGJTDEoVORWTK/Lvb+tK/4l57BcVuDNOMPonbyq/JUrevg8Wri1wV1TSz9kjA+Qh l6binWh8uY5q5OAbX6kepUkBT8k1cbYoLNHIgEj8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel , "Rafael J. Wysocki" Subject: [PATCH 4.9 054/128] ACPI: GED: use correct trigger type field in _Exx / _Lxx handling Date: Fri, 19 Jun 2020 16:32:28 +0200 Message-Id: <20200619141623.060188065@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141620.148019466@linuxfoundation.org> References: <20200619141620.148019466@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ard Biesheuvel commit e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9 upstream. Commit ea6f3af4c5e63f69 ("ACPI: GED: add support for _Exx / _Lxx handler methods") added a reference to the 'triggering' field of either the normal or the extended ACPI IRQ resource struct, but inadvertently used the wrong pointer in the latter case. Note that both pointers refer to the same union, and the 'triggering' field appears at the same offset in both struct types, so it currently happens to work by accident. But let's fix it nonetheless Fixes: ea6f3af4c5e63f69 ("ACPI: GED: add support for _Exx / _Lxx handler methods") Signed-off-by: Ard Biesheuvel Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/evged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -97,7 +97,7 @@ static acpi_status acpi_ged_request_inte trigger = p->triggering; } else { gsi = pext->interrupts[0]; - trigger = p->triggering; + trigger = pext->triggering; } irq = r.start;