OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89c8fb7
)
sisfb: delete obsolete PCI ROM bug workaround
author
Aaro Koskinen
<aaro.koskinen@iki.fi>
Fri, 19 Nov 2010 21:58:43 +0000
(21:58 +0000)
committer
Paul Mundt
<lethal@linux-sh.org>
Wed, 24 Nov 2010 07:02:32 +0000
(16:02 +0900)
Delete a workaround for a PCI ROM bug that has been fixed ages ago by
the commit
761a3ac08c63718dacde12aaf0ec6d6760e8c2b7
.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/video/sis/sis_main.c
patch
|
blob
|
history
diff --git
a/drivers/video/sis/sis_main.c
b/drivers/video/sis/sis_main.c
index
3dde12b
..
1073b70
100644
(file)
--- a/
drivers/video/sis/sis_main.c
+++ b/
drivers/video/sis/sis_main.c
@@
-4114,14
+4114,6
@@
sisfb_find_rom(struct pci_dev *pdev)
if(sisfb_check_rom(rom_base, ivideo)) {
if((myrombase = vmalloc(65536))) {
-
- /* Work around bug in pci/rom.c: Folks forgot to check
- * whether the size retrieved from the BIOS image eventually
- * is larger than the mapped size
- */
- if(pci_resource_len(pdev, PCI_ROM_RESOURCE) < romsize)
- romsize = pci_resource_len(pdev, PCI_ROM_RESOURCE);
-
memcpy_fromio(myrombase, rom_base,
(romsize > 65536) ? 65536 : romsize);
}