diff options
| author | Martin Peres <martin.peres@labri.fr> | 2012-10-20 11:03:36 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-22 12:25:49 +1000 |
| commit | 90e2889c4e24e2bde8f226402b46c66e18162860 (patch) | |
| tree | c7f6dd4426eaf6e8bbbc559d49adbac9a28b126b /drivers/gpu/drm | |
| parent | 2c14575f99ddd5b8384c5b460687ceba181900d8 (diff) | |
| download | talos-obmc-linux-90e2889c4e24e2bde8f226402b46c66e18162860.tar.gz talos-obmc-linux-90e2889c4e24e2bde8f226402b46c66e18162860.zip | |
drm/nouveau/bios: improve error handling when reading the vbios from ACPI
Reported-by: Pawel Sikora <pawel.sikora@agmk.net>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c index dcb5c2befc92..f65bfedcce66 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c @@ -188,8 +188,10 @@ nouveau_bios_shadow_acpi(struct nouveau_bios *bios) int ret, cnt, i; u8 data[3]; - if (!nouveau_acpi_rom_supported(pdev)) + if (!nouveau_acpi_rom_supported(pdev)) { + bios->data = NULL; return; + } bios->size = 0; if (nouveau_acpi_get_bios_chunk(data, 0, 3) == 3) |
