diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 16:05:23 +0200 |
| commit | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (patch) | |
| tree | 658ebb20e4fd5dee840f27103b59da367ff473b1 /drivers/input/mouse/pc110pad.c | |
| parent | 72e31981a4e91f84c5b5e8994f5d25b1cf22b6cf (diff) | |
| parent | 6574612fbb34c63117581e68f2231ddce027e41e (diff) | |
Merge branch 'fix/asoc' into topic/asoc
Diffstat (limited to 'drivers/input/mouse/pc110pad.c')
| -rw-r--r-- | drivers/input/mouse/pc110pad.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c index fd09c8df81f..3941f97cfa6 100644 --- a/drivers/input/mouse/pc110pad.c +++ b/drivers/input/mouse/pc110pad.c @@ -108,14 +108,10 @@ static int pc110pad_open(struct input_dev *dev) */ 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", |