git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull bugzilla-5737 into release branch
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
i810
/
i810_main.c
diff --git
a/drivers/video/i810/i810_main.c
b/drivers/video/i810/i810_main.c
index 44aa2ffff973e52b7f438fdef634d3cc5c0b6f7d..a1f7d80f0ac103928003127b7c6a2fb90c66f7b2 100644
(file)
--- a/
drivers/video/i810/i810_main.c
+++ b/
drivers/video/i810/i810_main.c
@@
-2110,9
+2110,6
@@
static void i810fb_release_resource(struct fb_info *info,
if (par->res_flags & MMIO_REQ)
release_mem_region(par->mmio_start_phys, MMIO_SIZE);
- if (par->res_flags & PCI_DEVICE_ENABLED)
- pci_disable_device(par->dev);
-
framebuffer_release(info);
}