diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 12:16:28 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 12:16:28 +0300 |
| commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
| tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /drivers/gpu/drm/radeon/radeon_connectors.c | |
| parent | 353c50ebe329daaf2c94dc41c1c481cbba2a31fd (diff) | |
| parent | 81bcfe5e48f9b8c42cf547f1c74c7f60c44c34c8 (diff) | |
| download | linux-0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1.tar.xz | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_connectors.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index e18839d52e3e..27affbde058c 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -931,7 +931,7 @@ static void radeon_connector_unregister(struct drm_connector *connector) { struct radeon_connector *radeon_connector = to_radeon_connector(connector); - if (radeon_connector->ddc_bus->has_aux) { + if (radeon_connector->ddc_bus && radeon_connector->ddc_bus->has_aux) { drm_dp_aux_unregister(&radeon_connector->ddc_bus->aux); radeon_connector->ddc_bus->has_aux = false; } |