linux-kernel - Re: [PATCH v2 1/5] xhci: Combine two if statements for Etron xHCI host

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <bceb89ce-7a4b-4447-8bd6-3129a37bfdb3@linux.intel.com>
Date: Wed, 30 Oct 2024 14:04:56 +0200
From: Mathias Nyman <mathias.nyman@...ux.intel.com>
To: Kuangyi Chiang <ki.chiang65@...il.com>, mathias.nyman@...el.com,
 gregkh@...uxfoundation.org
Cc: linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
 stable@...r.kernel.org
Subject: Re: [PATCH v2 1/5] xhci: Combine two if statements for Etron xHCI
 host

On 28.10.2024 4.53, Kuangyi Chiang wrote:
> Combine two if statements, because these hosts have the same
> quirk flags applied.
> 
> Fixes: 91f7a1524a92 ("xhci: Apply broken streams quirk to Etron EJ188 xHCI host")
> Cc: <stable@...r.kernel.org>
> Signed-off-by: Kuangyi Chiang <ki.chiang65@...il.com>

Added to queue, but I removed the Fixes and stable tags as this is a small
cleanup with no functional changes.

> ---
>   drivers/usb/host/xhci-pci.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index 7e538194a0a4..33a6d99afc10 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -395,12 +395,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
>   		xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
>   
>   	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
> -			pdev->device == PCI_DEVICE_ID_EJ168) {
> -		xhci->quirks |= XHCI_RESET_ON_RESUME;
> -		xhci->quirks |= XHCI_BROKEN_STREAMS;
> -	}
> -	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
> -			pdev->device == PCI_DEVICE_ID_EJ188) {
> +	    (pdev->device == PCI_DEVICE_ID_EJ168 ||
> +	     pdev->device == PCI_DEVICE_ID_EJ188)) {
>   		xhci->quirks |= XHCI_RESET_ON_RESUME;
>   		xhci->quirks |= XHCI_BROKEN_STREAMS;
>   	}