diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-02 21:26:24 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 10:30:58 +0200 |
| commit | addde4ec31456c5f1e9b61aae3edcfeb0f338f87 (patch) | |
| tree | c4c38789248147bab4e457e6f0da2a7cd5c2ad4c /drivers/gpu | |
| parent | Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/lin... (diff) | |
| download | linux-addde4ec31456c5f1e9b61aae3edcfeb0f338f87.tar.xz linux-addde4ec31456c5f1e9b61aae3edcfeb0f338f87.zip | |
nouveau: initialise has_optimus variable.
We should initialise this to 0 really to avoid getting false positives.
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 7814a760c164..284bd25d5d21 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c @@ -270,7 +270,7 @@ static bool nouveau_dsm_detect(void) struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name}; struct pci_dev *pdev = NULL; int has_dsm = 0; - int has_optimus; + int has_optimus = 0; int vga_count = 0; bool guid_valid; int retval; |