diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-09-22 05:19:20 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-22 05:19:20 -0400 |
commit | dd8e9ed6ed544e2b924429d29cd2a6b55590109b (patch) | |
tree | 0961c205e59591e7da65ce7504c919e7ee3e4351 /drivers/mtd/maps/ichxrom.c | |
parent | 668040fcd1e06fc3e68a92708cbdfa5a52c37d3c (diff) |
[MTD] Switch to pci_get_device and do ref counting
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/maps/ichxrom.c')
-rw-r--r-- | drivers/mtd/maps/ichxrom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index db4b570d874a..2bb3e63606e5 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c | |||
@@ -61,6 +61,7 @@ static void ichxrom_cleanup(struct ichxrom_window *window) | |||
61 | /* Disable writes through the rom window */ | 61 | /* Disable writes through the rom window */ |
62 | pci_read_config_word(window->pdev, BIOS_CNTL, &word); | 62 | pci_read_config_word(window->pdev, BIOS_CNTL, &word); |
63 | pci_write_config_word(window->pdev, BIOS_CNTL, word & ~1); | 63 | pci_write_config_word(window->pdev, BIOS_CNTL, word & ~1); |
64 | pci_dev_put(window->pdev); | ||
64 | 65 | ||
65 | /* Free all of the mtd devices */ | 66 | /* Free all of the mtd devices */ |
66 | list_for_each_entry_safe(map, scratch, &window->maps, list) { | 67 | list_for_each_entry_safe(map, scratch, &window->maps, list) { |
@@ -355,7 +356,7 @@ static int __init init_ichxrom(void) | |||
355 | 356 | ||
356 | pdev = NULL; | 357 | pdev = NULL; |
357 | for (id = ichxrom_pci_tbl; id->vendor; id++) { | 358 | for (id = ichxrom_pci_tbl; id->vendor; id++) { |
358 | pdev = pci_find_device(id->vendor, id->device, NULL); | 359 | pdev = pci_get_device(id->vendor, id->device, NULL); |
359 | if (pdev) { | 360 | if (pdev) { |
360 | break; | 361 | break; |
361 | } | 362 | } |