diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-12-12 22:37:44 -0500 |
| commit | f5ac34983411e4c4f41ab1817dce582830f398fd (patch) | |
| tree | 4d2c47513ae6893ff7ea928704718356eb3824cd /src/radeon_bios.c | |
| parent | f2b2e0804183b52d9d3f56ad85b3552ece76c544 (diff) | |
| parent | 6ccf5b33d27218ae1c45ab93c122438ed536d8ba (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge and fix conflicts
Diffstat (limited to 'src/radeon_bios.c')
| -rw-r--r-- | src/radeon_bios.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index cca3d43..7b4eafb 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -72,13 +72,12 @@ Bool RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) int tmp; unsigned short dptr; - if (!(info->VBIOS = xalloc( #ifdef XSERVER_LIBPCIACCESS - info->PciInfo->rom_size + info->VBIOS = xalloc(info->PciInfo->rom_size); #else - RADEON_VBIOS_SIZE + info->VBIOS = xalloc(RADEON_VBIOS_SIZE); #endif - ))) { + if (!info->VBIOS) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot allocate space for hold Video BIOS!\n"); return FALSE; |