From: Alex Deucher Date: Tue, 3 Sep 2013 18:03:21 +0000 (-0400) Subject: drm/radeon/dce6/audio: make sure pin is valid before accessing it X-Git-Tag: upstream/snapshot3+hdmi~4265^2~10^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7cc0a3d85b5d4acb69d60a88de0bd029bef04b4f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git drm/radeon/dce6/audio: make sure pin is valid before accessing it Make sure the audio pin is valid before accessing its members. Noticed by: Dan Carpenter Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index 8953255e..3853dda 100644 --- a/drivers/gpu/drm/radeon/dce6_afmt.c +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -86,12 +86,12 @@ void dce6_afmt_select_pin(struct drm_encoder *encoder) struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; u32 offset = dig->afmt->offset; - u32 id = dig->afmt->pin->id; if (!dig->afmt->pin) return; - WREG32(AFMT_AUDIO_SRC_CONTROL + offset, AFMT_AUDIO_SRC_SELECT(id)); + WREG32(AFMT_AUDIO_SRC_CONTROL + offset, + AFMT_AUDIO_SRC_SELECT(dig->afmt->pin->id)); } void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)