git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
drivers
/
pci
/
pci.c
diff --git
a/drivers/pci/pci.c
b/drivers/pci/pci.c
index
fe8a537
..
e3c97d9
100644
(file)
--- a/
drivers/pci/pci.c
+++ b/
drivers/pci/pci.c
@@
-385,6
+385,7
@@
pci_enable_device_bars(struct pci_dev *dev, int bars)
int
pci_enable_device(struct pci_dev *dev)
{
int
pci_enable_device(struct pci_dev *dev)
{
+ dev->is_enabled = 1;
return pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
}
return pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
}
@@
-399,6
+400,9
@@
void
pci_disable_device(struct pci_dev *dev)
{
u16 pci_command;
pci_disable_device(struct pci_dev *dev)
{
u16 pci_command;
+
+ dev->is_enabled = 0;
+ dev->is_busmaster = 0;
pci_read_config_word(dev, PCI_COMMAND, &pci_command);
if (pci_command & PCI_COMMAND_MASTER) {
pci_read_config_word(dev, PCI_COMMAND, &pci_command);
if (pci_command & PCI_COMMAND_MASTER) {
@@
-601,6
+605,7
@@
pci_set_master(struct pci_dev *dev)
cmd |= PCI_COMMAND_MASTER;
pci_write_config_word(dev, PCI_COMMAND, cmd);
}
cmd |= PCI_COMMAND_MASTER;
pci_write_config_word(dev, PCI_COMMAND, cmd);
}
+ dev->is_busmaster = 1;
pcibios_set_master(dev);
}
pcibios_set_master(dev);
}
@@
-640,7
+645,7
@@
pci_generic_prep_mwi(struct pci_dev *dev)
if (cacheline_size == pci_cache_line_size)
return 0;
if (cacheline_size == pci_cache_line_size)
return 0;
- printk(KERN_
WARNIN
G "PCI: cache line size of %d is not supported "
+ printk(KERN_
DEBU
G "PCI: cache line size of %d is not supported "
"by device %s\n", pci_cache_line_size << 2, pci_name(dev));
return -EINVAL;
"by device %s\n", pci_cache_line_size << 2, pci_name(dev));
return -EINVAL;