Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 322150
b: refs/heads/master
c: 7c3906d
h: refs/heads/master
v: v3
  • Loading branch information
Alex Deucher committed Aug 20, 2012
1 parent 6cd97db commit 7397a67
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f81f986761a7663db7d24d24cd6ae68008f1fc2
refs/heads/master: 7c3906d04a4587dceaa78cc1ae6b14e6454ee02a
6 changes: 2 additions & 4 deletions trunk/drivers/gpu/drm/radeon/radeon_bios.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,12 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
{
bool ret = false;
struct acpi_table_header *hdr;
/* acpi_get_table_with_size is not exported :( */
acpi_size tbl_size = 0x7fffffff;
acpi_size tbl_size;
UEFI_ACPI_VFCT *vfct;
GOP_VBIOS_CONTENT *vbios;
VFCT_IMAGE_HEADER *vhdr;

if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr)))
if (!ACPI_SUCCESS(acpi_get_table_with_size("VFCT", 1, &hdr, &tbl_size)))
return false;
if (tbl_size < sizeof(UEFI_ACPI_VFCT)) {
DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n");
Expand Down Expand Up @@ -525,7 +524,6 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
ret = !!rdev->bios;

out_unmap:
/* uh, no idea what to do here... */
return ret;
}
#else
Expand Down

0 comments on commit 7397a67

Please sign in to comment.