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=-12.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 BE29CC282D5 for ; Wed, 30 Jan 2019 08:36:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D9602184D for ; Wed, 30 Jan 2019 08:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548837409; bh=ckbIIP4NyN5gXl6L/M+5F7eYCiMNZknWmFnLNQBDrLE=; h=Subject:To:From:Date:List-ID:From; b=Nd+CJ6x6Iy3JHCXJJs/XPTmxLgrKnd7s/18hFnaEWZehdODmXFTQICvlM6T6eIuof xDShuxhs/O3Yk3Vw2vRL05+U+5XgoPMka2HvLM5EuSXrcnPYl7/3XEPeL6S1kKHjjR 7RCGOuV2VCOf7lqCZ/IBtlMptBcM+lSuzJzSrTVo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727500AbfA3Igt (ORCPT ); Wed, 30 Jan 2019 03:36:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:38424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726452AbfA3Igt (ORCPT ); Wed, 30 Jan 2019 03:36:49 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 E0C9621873; Wed, 30 Jan 2019 08:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548837408; bh=ckbIIP4NyN5gXl6L/M+5F7eYCiMNZknWmFnLNQBDrLE=; h=Subject:To:From:Date:From; b=TOtYeKUgXh/8hafCsK8201sb79/bw9TxH3JAfP22G6ddJmbWvNKK0wHZN0ax5sSRT 0WfehYDWOgqJUSaQ5Uc0HKCPOW41ZYBFL/YAYBkoaaAv9Ich7byRskz8A+yWUo2+rK Hoy+sGNn2bXpj8+dtbYsInHAiIt80NLvaN09U0mk= Subject: patch "serial: 8250_pci: Make PCI class test non fatal" added to tty-linus To: andriy.shevchenko@linux.intel.com, Gerhard.KHUENY@bachmann.info, gregkh@linuxfoundation.org, guan.yung.tseng@ni.com, stable@vger.kernel.org From: Date: Wed, 30 Jan 2019 09:36:35 +0100 Message-ID: <154883739516237@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled serial: 8250_pci: Make PCI class test non fatal to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-linus branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will hopefully also be merged in Linus's tree for the next -rc kernel release. If you have any questions about this process, please let me know. >From 824d17c57b0abbcb9128fb3f7327fae14761914b Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 24 Jan 2019 23:51:21 +0200 Subject: serial: 8250_pci: Make PCI class test non fatal As has been reported the National Instruments serial cards have broken PCI class. The commit 7d8905d06405 ("serial: 8250_pci: Enable device after we check black list") made the PCI class check mandatory for the case when device is listed in a quirk list. Make PCI class test non fatal to allow broken card be enumerated. Fixes: 7d8905d06405 ("serial: 8250_pci: Enable device after we check black list") Cc: stable Reported-by: Guan Yung Tseng Tested-by: Guan Yung Tseng Tested-by: KHUENY.Gerhard Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/8250/8250_pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index f80a300b5d68..48bd694a5fa1 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -3420,6 +3420,11 @@ static int serial_pci_guess_board(struct pci_dev *dev, struct pciserial_board *board) { int num_iomem, num_port, first_port = -1, i; + int rc; + + rc = serial_pci_is_class_communication(dev); + if (rc) + return rc; /* * Should we try to make guesses for multiport serial devices later? @@ -3647,10 +3652,6 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent) board = &pci_boards[ent->driver_data]; - rc = serial_pci_is_class_communication(dev); - if (rc) - return rc; - rc = serial_pci_is_blacklisted(dev); if (rc) return rc; -- 2.20.1