diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 03:00:33 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-08 03:00:33 -0400 |
| commit | ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d (patch) | |
| tree | 6d58e91731385281436da191e82c56cd1627482f /drivers/input/mouse/pc110pad.c | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| parent | 59cc1dd97ca9ac0363ef2f770901fbd86e2b970a (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse/pc110pad.c')
| -rw-r--r-- | drivers/input/mouse/pc110pad.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c index fd09c8df81f2..f63995f854ff 100644 --- a/drivers/input/mouse/pc110pad.c +++ b/drivers/input/mouse/pc110pad.c | |||
| @@ -111,11 +111,8 @@ static int __init pc110pad_init(void) | |||
| 111 | struct pci_dev *dev; | 111 | struct pci_dev *dev; |
| 112 | int err; | 112 | int err; |
| 113 | 113 | ||
| 114 | dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL); | 114 | if (!no_pci_devices()) |
| 115 | if (dev) { | ||
| 116 | pci_dev_put(dev); | ||
| 117 | return -ENODEV; | 115 | return -ENODEV; |
| 118 | } | ||
| 119 | 116 | ||
| 120 | if (!request_region(pc110pad_io, 4, "pc110pad")) { | 117 | if (!request_region(pc110pad_io, 4, "pc110pad")) { |
| 121 | printk(KERN_ERR "pc110pad: I/O area %#x-%#x in use.\n", | 118 | printk(KERN_ERR "pc110pad: I/O area %#x-%#x in use.\n", |