diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-10-13 13:23:48 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-10-16 18:34:06 -0400 |
| commit | 83d04c39f9048807a8500e575ae3f1718a3f45bb (patch) | |
| tree | 87a635abaed70e5eb69749d2a27a3e5f67588b6a /drivers/gpu | |
| parent | 1db7802418596880b51d78408f10f25e6fbd8656 (diff) | |
drm/radeon: initialize sadb to NULL in the audio code
Fixes kfree of the sadb buffer when it's NULL.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/dce6_afmt.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c b/drivers/gpu/drm/radeon/dce3_1_afmt.c index 950af153f30e..6b1dbecdd36d 100644 --- a/drivers/gpu/drm/radeon/dce3_1_afmt.c +++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c | |||
| @@ -32,7 +32,7 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder) | |||
| 32 | struct drm_connector *connector; | 32 | struct drm_connector *connector; |
| 33 | struct radeon_connector *radeon_connector = NULL; | 33 | struct radeon_connector *radeon_connector = NULL; |
| 34 | u32 tmp; | 34 | u32 tmp; |
| 35 | u8 *sadb; | 35 | u8 *sadb = NULL; |
| 36 | int sad_count; | 36 | int sad_count; |
| 37 | 37 | ||
| 38 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { | 38 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { |
diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c index c0bbf68dbc27..960a5f0f042f 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) | |||
| 155 | struct drm_connector *connector; | 155 | struct drm_connector *connector; |
| 156 | struct radeon_connector *radeon_connector = NULL; | 156 | struct radeon_connector *radeon_connector = NULL; |
| 157 | u32 offset, tmp; | 157 | u32 offset, tmp; |
| 158 | u8 *sadb; | 158 | u8 *sadb = NULL; |
| 159 | int sad_count; | 159 | int sad_count; |
| 160 | 160 | ||
| 161 | if (!dig || !dig->afmt || !dig->afmt->pin) | 161 | 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 2514d659b1ba..f6a5c3026f85 100644 --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c | |||
| @@ -133,7 +133,7 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder) | |||
| 133 | struct drm_connector *connector; | 133 | struct drm_connector *connector; |
| 134 | struct radeon_connector *radeon_connector = NULL; | 134 | struct radeon_connector *radeon_connector = NULL; |
| 135 | u32 tmp; | 135 | u32 tmp; |
| 136 | u8 *sadb; | 136 | u8 *sadb = NULL; |
| 137 | int sad_count; | 137 | int sad_count; |
| 138 | 138 | ||
| 139 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { | 139 | list_for_each_entry(connector, &encoder->dev->mode_config.connector_list, head) { |
