Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 346fced8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

parents 17af691c 43a6b760

arch/i386/kernel/cpu/cpufreq/gx-suspmod.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static __init struct pci_dev *gx_detect_chipset(void) 


	/* detect which companion chip is used */

	while ((gx_pci = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, gx_pci)) != NULL) {

		if ((pci_match_device (gx_chipset_tbl, gx_pci)) != NULL) {

		if ((pci_match_id(gx_chipset_tbl, gx_pci)) != NULL) {

			return gx_pci;

		}

	}

arch/i386/pci/common.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static int __init pcibios_init(void) 
	if ((pci_probe & PCI_BIOS_SORT) && !(pci_probe & PCI_NO_SORT))

		pcibios_sort();

#endif

	pci_assign_unassigned_resources();

	return 0;

}

arch/i386/pci/i386.c

+8 −3
Original line number Diff line number Diff line
@@ -106,11 +106,16 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
		if ((dev = bus->self)) {

			for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {

				r = &dev->resource[idx];

				if (!r->start)

				if (!r->flags)

					continue;

				pr = pci_find_parent_resource(dev, r);

				if (!pr || request_resource(pr, r) < 0)

				if (!r->start || !pr || request_resource(pr, r) < 0) {

					printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));

					/* Something is wrong with the region.

					   Invalidate the resource to prevent child

					   resource allocations in this range. */

					r->flags = 0;

				}

			}

		}

		pcibios_allocate_bus_resources(&bus->children);
@@ -227,7 +232,7 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) 


	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	old_cmd = cmd;

	for(idx=0; idx<6; idx++) {

	for(idx = 0; idx < PCI_NUM_RESOURCES; idx++) {

		/* Only set up the requested stuff */

		if (!(mask & (1<<idx)))

			continue;

drivers/char/hw_random.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static int __init rng_init (void) 


	/* Probe for Intel, AMD RNGs */

	for_each_pci_dev(pdev) {

		ent = pci_match_device (rng_pci_tbl, pdev);

		ent = pci_match_id(rng_pci_tbl, pdev);

		if (ent) {

			rng_ops = &rng_vendor_ops[ent->driver_data];

			goto match;

drivers/char/watchdog/i8xx_tco.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static unsigned char __init i8xx_tco_getdevice (void) 
	 */



	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

		if (pci_match_device(i8xx_tco_pci_tbl, dev)) {

		if (pci_match_id(i8xx_tco_pci_tbl, dev)) {

			i8xx_tco_pci = dev;

			break;

		}