summaryrefslogtreecommitdiffstats
path: root/drivers/video/intelfb/intelfb.h
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-12-19 15:11:40 +0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-20 09:27:15 -0800
commit4b3760ce3d448d4af3036cd6c650d651a16ee02d (patch)
tree369f5680fad714f215f7b96b7b62975d55c55424 /drivers/video/intelfb/intelfb.h
parent6ee7fb7e363aa8828b3920422416707c79f39007 (diff)
[PATCH] intelfb: Fix freeing of nonexistent resource
Fix intelfb trying to free a non-existent resource in its error path. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/intelfb/intelfb.h')
-rw-r--r--drivers/video/intelfb/intelfb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index f077ca34fab..da29d007f21 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -41,6 +41,10 @@
/*** hw-related values ***/
+/* Resource Allocation */
+#define INTELFB_FB_ACQUIRED 1
+#define INTELFB_MMIO_ACQUIRED 2
+
/* PCI ids for supported devices */
#define PCI_DEVICE_ID_INTEL_830M 0x3577
#define PCI_DEVICE_ID_INTEL_845G 0x2562
@@ -257,6 +261,7 @@ struct intelfb_info {
int hwcursor;
int fixed_mode;
int ring_active;
+ int flag;
/* hw cursor */
int cursor_on;