projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[deliverable/linux.git]
/
drivers
/
ata
/
ata_generic.c
diff --git
a/drivers/ata/ata_generic.c
b/drivers/ata/ata_generic.c
index 47aeccd52fa951b900bacd63d4af7e71cf370039..5c33767e66de8e25493fe37343c5fe433c2971b7 100644
(file)
--- a/
drivers/ata/ata_generic.c
+++ b/
drivers/ata/ata_generic.c
@@
-1,6
+1,6
@@
/*
* ata_generic.c - Generic PATA/SATA controller driver.
/*
* ata_generic.c - Generic PATA/SATA controller driver.
- * Copyright 2005 Red Hat Inc
<alan@redhat.com>
, all rights reserved.
+ * Copyright 2005 Red Hat Inc, all rights reserved.
*
* Elements from ide/pci/generic.c
* Copyright (C) 2001-2002 Andre Hedrick <andre@linux-ide.org>
*
* Elements from ide/pci/generic.c
* Copyright (C) 2001-2002 Andre Hedrick <andre@linux-ide.org>
@@
-152,6
+152,12
@@
static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
if (dev->vendor == PCI_VENDOR_ID_AL)
ata_pci_bmdma_clear_simplex(dev);
if (dev->vendor == PCI_VENDOR_ID_AL)
ata_pci_bmdma_clear_simplex(dev);
+ if (dev->vendor == PCI_VENDOR_ID_ATI) {
+ int rc = pcim_enable_device(dev);
+ if (rc < 0)
+ return rc;
+ pcim_pin_device(dev);
+ }
return ata_pci_sff_init_one(dev, ppi, &generic_sht, NULL);
}
return ata_pci_sff_init_one(dev, ppi, &generic_sht, NULL);
}
This page took
0.025244 seconds
and
5
git commands to generate.