diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-06-10 14:56:38 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-06-10 14:56:38 -0400 |
commit | 96fe439ec9ca25b09e1458d86bd739757ae11ea1 (patch) | |
tree | 584573cf7c42383e4baa5cd7081bcd4926a67ed0 /drivers/ide | |
parent | 1c4d4ad50ac5cc74c605c4a467db42c961ec7a69 (diff) |
delkin_cb: add warm-plug support
Don't fail the probe if there are no devices attached to the controller.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/pci/delkin_cb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c index 1b69e4dd5522..538f8045d416 100644 --- a/drivers/ide/pci/delkin_cb.c +++ b/drivers/ide/pci/delkin_cb.c | |||
@@ -100,15 +100,11 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) | |||
100 | 100 | ||
101 | ide_device_add(idx, &delkin_cb_port_info); | 101 | ide_device_add(idx, &delkin_cb_port_info); |
102 | 102 | ||
103 | if (!hwif->present) | ||
104 | goto out_disable; | ||
105 | |||
106 | pci_set_drvdata(dev, hwif); | 103 | pci_set_drvdata(dev, hwif); |
107 | 104 | ||
108 | return 0; | 105 | return 0; |
109 | 106 | ||
110 | out_disable: | 107 | out_disable: |
111 | printk(KERN_ERR "delkin_cb: no IDE devices found\n"); | ||
112 | pci_release_regions(dev); | 108 | pci_release_regions(dev); |
113 | pci_disable_device(dev); | 109 | pci_disable_device(dev); |
114 | return -ENODEV; | 110 | return -ENODEV; |