diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 15:58:38 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 15:58:38 -0800 |
commit | b286e39207237e2f6929959372bf66d9a8d05a82 (patch) | |
tree | 0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e /drivers/ide/pci/cs5520.c | |
parent | bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 (diff) | |
parent | 6593178dd46d64a5bcb0402a4f3acd95b0687abd (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/ide/pci/cs5520.c')
-rw-r--r-- | drivers/ide/pci/cs5520.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index 7dc24682d19..ea3c52cc8ac 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c @@ -222,10 +222,9 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic /* We must not grab the entire device, it has 'ISA' space in its BARS too and we will freak out other bits of the kernel */ - if(pci_enable_device_bars(dev, 1<<2)) - { + if (pci_enable_device_bars(dev, 1<<2)) { printk(KERN_WARNING "%s: Unable to enable 55x0.\n", d->name); - return 1; + return -ENODEV; } pci_set_master(dev); if (pci_set_dma_mask(dev, DMA_32BIT_MASK)) { |