]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drm/radeon/kms: Fix crash getting TV info with no BIOS.
authorMichel Dänzer <daenzer@vmware.com>
Mon, 11 Jan 2010 07:58:38 +0000 (08:58 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Jan 2010 03:25:10 +0000 (13:25 +1000)
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_combios.c

index 7914455c96ca9024814d152fee0c37439b1129ee..579c8920e08144b4f6eea6311e706d0aa921ca5b 100644 (file)
@@ -687,6 +687,9 @@ radeon_combios_get_tv_info(struct radeon_device *rdev)
        uint16_t tv_info;
        enum radeon_tv_std tv_std = TV_STD_NTSC;
 
+       if (rdev->bios == NULL)
+               return tv_std;
+
        tv_info = combios_get_table_offset(dev, COMBIOS_TV_INFO_TABLE);
        if (tv_info) {
                if (RBIOS8(tv_info + 6) == 'T') {