From 9dba04df63d78ec6d5aca49581324f160b1e99b3 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Thu, 29 Jan 2009 22:56:08 -0800 Subject: [PATCH] --- yaml --- r: 143132 b: refs/heads/master c: b0ee0d3eb31a163c958f2960906c44bcdfdc607b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/pc110pad.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2d67ce8834ee..686e40a659d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03dd5e1ba55d43c3a12b8514f9889049037f17f7 +refs/heads/master: b0ee0d3eb31a163c958f2960906c44bcdfdc607b diff --git a/trunk/drivers/input/mouse/pc110pad.c b/trunk/drivers/input/mouse/pc110pad.c index fd09c8df81f2..f63995f854ff 100644 --- a/trunk/drivers/input/mouse/pc110pad.c +++ b/trunk/drivers/input/mouse/pc110pad.c @@ -111,11 +111,8 @@ static int __init pc110pad_init(void) struct pci_dev *dev; int err; - dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL); - if (dev) { - pci_dev_put(dev); + if (!no_pci_devices()) return -ENODEV; - } if (!request_region(pc110pad_io, 4, "pc110pad")) { printk(KERN_ERR "pc110pad: I/O area %#x-%#x in use.\n",