diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-12 13:13:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-06 10:53:09 +1000 |
| commit | 0ed24f339a3ca561d9e849ccbfe33849e80df378 (patch) | |
| tree | 3c92fa76f1ce221c25d1fd62ffafa2928fcf74a3 | |
| parent | b8e594bf9a38eb59a0c23a11809aa534acbcd30a (diff) | |
avivotool: fix fb mapping failure
fix radeontool also
| -rw-r--r-- | avivotool.c | 7 | ||||
| -rw-r--r-- | radeontool.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/avivotool.c b/avivotool.c index 4325cc6..dd819a7 100644 --- a/avivotool.c +++ b/avivotool.c @@ -1618,9 +1618,10 @@ static int map_radeon_mem(void) fatal("mapping ctrl region\n"); ctrl_mem = avivo_device->regions[ctrl_region].memory; - if (pci_device_map_region(avivo_device, fb_region, 1) != 0) - fatal("mapping fb region\n"); - fb_mem = avivo_device->regions[fb_region].memory; + if (pci_device_map_region(avivo_device, fb_region, 1) == 0) + fb_mem = avivo_device->regions[fb_region].memory; + else + fb_mem = NULL; pci_iterator_destroy(iter); diff --git a/radeontool.c b/radeontool.c index ba20c78..7718dde 100644 --- a/radeontool.c +++ b/radeontool.c @@ -968,9 +968,10 @@ static void map_radeon_cntl_mem(void) fatal("mapping ctrl region\n"); ctrl_mem = avivo_device->regions[ctrl_region].memory; - if (pci_device_map_region(avivo_device, fb_region, 1) != 0) - fatal("mapping fb region\n"); - fb_mem = avivo_device->regions[fb_region].memory; + if (pci_device_map_region(avivo_device, fb_region, 1) == 0) + fb_mem = avivo_device->regions[fb_region].memory; + else + fb_mem = NULL; pci_iterator_destroy(iter); |