mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] openprom: Switch to ref counting PCI API
@ 2007-04-23 13:58 Alan Cox
  2007-04-24  5:51 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2007-04-23 13:58 UTC (permalink / raw)
  To: davem, linux-kernel

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc6-mm1/drivers/sbus/char/openprom.c linux-2.6.21-rc6-mm1/drivers/sbus/char/openprom.c
--- linux.vanilla-2.6.21-rc6-mm1/drivers/sbus/char/openprom.c	2007-04-12 14:14:44.000000000 +0100
+++ linux-2.6.21-rc6-mm1/drivers/sbus/char/openprom.c	2007-04-23 12:13:55.087685248 +0100
@@ -249,7 +249,7 @@
 #ifdef CONFIG_PCI
 		struct pci_dev *pdev;
 		struct pcidev_cookie *pcp;
-		pdev = pci_find_slot (((int *) op->oprom_array)[0],
+		pdev = pci_get_bus_and_slot (((int *) op->oprom_array)[0],
 				      ((int *) op->oprom_array)[1]);
 
 		pcp = pdev->sysdata;
@@ -260,6 +260,7 @@
 			op->oprom_size = sizeof(int);
 			err = copyout(argp, op, bufsize + sizeof(int));
 		}
+		pci_dev_put(pdev);
 #endif
 	}
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] openprom: Switch to ref counting PCI API
  2007-04-23 13:58 [PATCH] openprom: Switch to ref counting PCI API Alan Cox
@ 2007-04-24  5:51 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-04-24  5:51 UTC (permalink / raw)
  To: alan; +Cc: linux-kernel

From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 23 Apr 2007 14:58:40 +0100

> Signed-off-by: Alan Cox <alan@redhat.com>

Applied, thanks Alan.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-04-24  5:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-04-23 13:58 [PATCH] openprom: Switch to ref counting PCI API Alan Cox
2007-04-24  5:51 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®