Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1772792pxb; Thu, 16 Sep 2021 15:29:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoj10HZBu3FNitrJ2GE/IKIUmc/1d5vQP4DPEg8LdNA894Jhi+7ujAxwT7hiA18X4a5EBW X-Received: by 2002:a92:d90b:: with SMTP id s11mr5315523iln.206.1631831391348; Thu, 16 Sep 2021 15:29:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631831391; cv=none; d=google.com; s=arc-20160816; b=AGHezZY1xuu9eTlJkQnJX2qcC57pCq8NF+t+RMCtELe1e9hPS+Yex8cp1n1ZxeAsfI /m1UtWEPmDu98PwHOowEBgs9ginsuldnymhAPpBkIPMiJV77fXvyMjfAFOKVTMatw/Hj 27QwL3Rd/72A/WzgjbyQ0YZp4vjmNlNl9Xnzx/tS1hG6aRwNd6nGcPZHvuV6r8fgaXW5 +hTCYQefUcumAw2Sb2ITgZ5VcBWV4sxlQMxl6R4SFbDc41O2Y4wLYNEHVC/FSbyLIx2s 7Q4dpTNDBqvyFeNlazdeibpgTKhoF+AoFZojQCibiYADdYJhuH4UfEcEaWk28AH3dRmt JvCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0tNr9MazsPKl6mBNhKPxkDJo1Rzcw8IyiVcr/HnovJo=; b=yyEDR2oRNTjhM5PbqNW3t9gqFCNSZQhEJfFkVcmdBt292z1sZhPLLgaCZUoG+4OTir /d+QQHB+ertD3x0le79JstRNjNKgAgCHkkX9N/h2MgRhurRPvk7emEg5+ic+mhYRBukF EmGhG71RRqllFtSF32SsiyIVhlZ7T9PjC8OSLjp+JGWcHxlJlQkmtG7gNM4f1g9+p8Qo qCe0nr7aK74wICK/MxV1K/xFxXvMmJ59RH5sBiPkpa5oFXpBcOCmm/Gi5RzQSE/c8QeH 1EyZXhG60vgnkgiNJF03h/XmCpBNRQyoaUADtwZwmZ9Ny43NCD7Lm0/EPcl9qxaFTVgc Jcaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JWOg4KKl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o12si3738845iow.40.2021.09.16.15.29.39; Thu, 16 Sep 2021 15:29:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JWOg4KKl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244322AbhIPQqH (ORCPT + 99 others); Thu, 16 Sep 2021 12:46:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:52386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245017AbhIPQkB (ORCPT ); Thu, 16 Sep 2021 12:40:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1464F61A0A; Thu, 16 Sep 2021 16:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809410; bh=W5i60Y4QgjuME9OVVg9F7XwbHir4B+GwL357gXa7670=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JWOg4KKl0+c7Sqfshyc2w8eKcq+vJsSMAmrGkqH88xA8BWUp3sbTkDpL6QhcUctr5 SFsxI21EHBJmw/V2o1y24lyt5t6oqLqbO37N4BrN4dpqn6nG49gWS+G+UEVldhPxzX oE2JBDJy3PBrymtJyEH4/ruC08etayYFQNSBfvDE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jim Broadus , Jiri Kosina , Sasha Levin Subject: [PATCH 5.13 112/380] HID: i2c-hid: Fix Elan touchpad regression Date: Thu, 16 Sep 2021 17:57:49 +0200 Message-Id: <20210916155807.843995728@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jim Broadus [ Upstream commit 786537063bbfb3a7ebc6fc21b2baf37fb91df401 ] A quirk was recently added for Elan devices that has same device match as an entry earlier in the list. The i2c_hid_lookup_quirk function will always return the last match in the list, so the new entry shadows the old entry. The quirk in the previous entry, I2C_HID_QUIRK_BOGUS_IRQ, silenced a flood of messages which have reappeared in the 5.13 kernel. This change moves the two quirk flags into the same entry. Fixes: ca66a6770bd9 (HID: i2c-hid: Skip ELAN power-on command after reset) Signed-off-by: Jim Broadus Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/i2c-hid/i2c-hid-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 46474612e73c..517141138b00 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -171,8 +171,6 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, { I2C_VENDOR_ID_RAYDIUM, I2C_PRODUCT_ID_RAYDIUM_3118, I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, - { USB_VENDOR_ID_ELAN, HID_ANY_ID, - I2C_HID_QUIRK_BOGUS_IRQ }, { USB_VENDOR_ID_ALPS_JP, HID_ANY_ID, I2C_HID_QUIRK_RESET_ON_RESUME }, { I2C_VENDOR_ID_SYNAPTICS, I2C_PRODUCT_ID_SYNAPTICS_SYNA2393, @@ -183,7 +181,8 @@ static const struct i2c_hid_quirks { * Sending the wakeup after reset actually break ELAN touchscreen controller */ { USB_VENDOR_ID_ELAN, HID_ANY_ID, - I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET }, + I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET | + I2C_HID_QUIRK_BOGUS_IRQ }, { 0, 0 } }; -- 2.30.2