Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf8f501 authored by Frédéric Brière's avatar Frédéric Brière Committed by Greg Kroah-Hartman
Browse files

serial: 8250_pci: add .probe member to struct pci_serial_quirk 



This function, if present, is called early on by the 8250_pci probe; it
can be used to reject devices meant for parport_serial.  (The .init
function cannot be used for this purpose, as it is also called by
parport_serial.)

Signed-off-by: default avatarFrédéric Brière <fbriere@fbriere.net>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Cc: linux-serial@vger.kernel.org
Cc: linux-parport@lists.infradead.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7808edcd

drivers/tty/serial/8250_pci.c

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct pci_serial_quirk { 
	u32	device;

	u32	subvendor;

	u32	subdevice;

	int	(*probe)(struct pci_dev *dev);

	int	(*init)(struct pci_dev *dev);

	int	(*setup)(struct serial_private *,

			 const struct pciserial_board *,
@@ -2662,11 +2663,19 @@ EXPORT_SYMBOL_GPL(pciserial_resume_ports); 
static int __devinit

pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)

{

	struct pci_serial_quirk *quirk;

	struct serial_private *priv;

	const struct pciserial_board *board;

	struct pciserial_board tmp;

	int rc;



	quirk = find_quirk(dev);

	if (quirk->probe) {

		rc = quirk->probe(dev);

		if (rc)

			return rc;

	}



	if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {

		printk(KERN_ERR "pci_init_one: invalid driver_data: %ld\n",

			ent->driver_data);