Skip to content

Commit

Permalink
PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device …
Browse files Browse the repository at this point in the history
…disable"

This reverts commit 53e4d30.

It was found that it caused unneeded problems (see
http://bugzilla.kernel.org/show_bug.cgi?id=7082 for details of one such
issue.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Nov 3, 2006
1 parent 2de6c39 commit 6851ecc
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion arch/i386/pci/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)

void pcibios_disable_device (struct pci_dev *dev)
{
pcibios_disable_resources(dev);
if (pcibios_disable_irq)
pcibios_disable_irq(dev);
}
9 changes: 0 additions & 9 deletions arch/i386/pci/i386.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,6 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
return 0;
}

void pcibios_disable_resources(struct pci_dev *dev)
{
u16 cmd;

pci_read_config_word(dev, PCI_COMMAND, &cmd);
cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
pci_write_config_word(dev, PCI_COMMAND, cmd);
}

/*
* If we set up a device for bus mastering, we need to check the latency
* timer as certain crappy BIOSes forget to set it properly.
Expand Down
1 change: 0 additions & 1 deletion arch/i386/pci/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ extern unsigned int pcibios_max_latency;

void pcibios_resource_survey(void);
int pcibios_enable_resources(struct pci_dev *, int);
void pcibios_disable_resources(struct pci_dev *);

/* pci-pc.c */

Expand Down

0 comments on commit 6851ecc

Please sign in to comment.