diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2010-01-07 12:58:56 -0700 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-11 15:09:02 +1000 |
| commit | 3d4a7882b11299104a0e74425dece2e26ac98024 (patch) | |
| tree | e530148d5def57faaef318e6d73572c221256fcc | |
| parent | 67fe63b0715ccfaefa0af8a6e705c5470ee5cada (diff) | |
| download | squashfs-lzma-3d4a7882b11299104a0e74425dece2e26ac98024.tar.gz | |
agp/hp: fail gracefully if we don't find an IOC
Bail out if we don't find an enclosing IOC. Previously, if we didn't
find one, we tried to set things up using garbage for the SBA/IOC register
address, which causes a crash.
This crash only happens if firmware supplies a defective ACPI namespace, so
it doesn't fix any problems in the field.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/char/agp/hp-agp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index dc8a6f70483b5..58752b70efead 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c @@ -508,6 +508,9 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret) handle = parent; } while (ACPI_SUCCESS(status)); + if (ACPI_FAILURE(status)) + return AE_OK; /* found no enclosing IOC */ + if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) return AE_OK; |