ACK: [Trusty][SRU][linux-3.13.y][PATCH] drm/radeon: initialize sadb to NULL in the audio code

[Brad Figg]

On Mon, Dec 15, 2014 at 09:53:34AM -0600, Chris J Arges wrote:
> From: Alex Deucher <alexander.deucher at amd.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1402714
> 
> Fixes kfree of the sadb buffer when it's NULL.
> 
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> (backported from commit 83d04c39f9048807a8500e575ae3f1718a3f45bb)
> Signed-off-by: Chris J Arges <chris.j.arges at canonical.com>
> 
> Conflicts:
> 	drivers/gpu/drm/radeon/dce3_1_afmt.c
> ---
>  drivers/gpu/drm/radeon/dce6_afmt.c      | 2 +-
>  drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 +-
>  drivers/gpu/drm/radeon/r600_hdmi.c      | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c
> index 3483828..a6e5151 100644
> --- a/drivers/gpu/drm/radeon/dce6_afmt.c
> +++ b/drivers/gpu/drm/radeon/dce6_afmt.c
> @@ -155,7 +155,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)
>  	struct drm_connector *connector;
>  	struct radeon_connector *radeon_connector = NULL;
>  	u32 offset, tmp;
> -	u8 *sadb;
> +	u8 *sadb = NULL;
>  	int sad_count;
>  
>  	if (!dig || !dig->afmt || !dig->afmt->pin)
> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> index 738c1ec..a10879d 100644
> --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> @@ -102,7 +102,7 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder)
>  	struct drm_connector *connector;
>  	struct radeon_connector *radeon_connector = NULL;
>  	u32 tmp;
> -	u8 *sadb;
> +	u8 *sadb = NULL;
>  	int sad_count;
>  
>  	list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) {
> diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
> index b7d3ecb..bae30c6 100644
> --- a/drivers/gpu/drm/radeon/r600_hdmi.c
> +++ b/drivers/gpu/drm/radeon/r600_hdmi.c
> @@ -326,7 +326,7 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder)
>  	struct drm_connector *connector;
>  	struct radeon_connector *radeon_connector = NULL;
>  	u32 tmp;
> -	u8 *sadb;
> +	u8 *sadb = NULL;
>  	int sad_count;
>  
>  	/* XXX: setting this register causes hangs on some asics */
> -- 
> 1.9.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Looks obviously correct

-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com