projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop-3.0-jb' into develop-3.0
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
video.c
diff --git
a/drivers/acpi/video.c
b/drivers/acpi/video.c
index db39e9e607d85542e100967a5783b1bf791e792d..623a3357ce9be6ccdc3f97402da59081ab6ddf2c 100644
(file)
--- a/
drivers/acpi/video.c
+++ b/
drivers/acpi/video.c
@@
-1732,6
+1732,7
@@
static int acpi_video_bus_remove(struct acpi_device *device, int type)
static int __init intel_opregion_present(void)
{
static int __init intel_opregion_present(void)
{
+ int i915 = 0;
#if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE)
struct pci_dev *dev = NULL;
u32 address;
#if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE)
struct pci_dev *dev = NULL;
u32 address;
@@
-1744,10
+1745,10
@@
static int __init intel_opregion_present(void)
pci_read_config_dword(dev, 0xfc, &address);
if (!address)
continue;
pci_read_config_dword(dev, 0xfc, &address);
if (!address)
continue;
-
return
1;
+
i915 =
1;
}
#endif
}
#endif
- return
0
;
+ return
i915
;
}
int acpi_video_register(void)
}
int acpi_video_register(void)