From: Gustavo Padovan <gustavo.pado...@collabora.co.uk>
If the save_encoder_crtcs or save_connector_encoders allocation fail
we need to free everything we have already allocated.
Signed-off-by: Gustavo Padovan <gustavo.pado...@collabora.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 05937fe..a8a8abe 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11018,13 +11018,13 @@ static int intel_set_config_save_state(struct
drm_device *dev,
kcalloc(dev->mode_config.num_encoder,
sizeof(struct drm_crtc *), GFP_KERNEL);
if (!config->save_encoder_crtcs)
- return -ENOMEM;
+ goto free_crtc;
config->save_connector_encoders =
kcalloc(dev->mode_config.num_connector,
sizeof(struct drm_encoder *), GFP_KERNEL);
if (!config->save_connector_encoders)
- return -ENOMEM;
+ goto free_encoder;
/* Copy data. Note that driver private data is not affected.
* Should anything bad happen only the expected state is
@@ -11046,6 +11046,12 @@ static int intel_set_config_save_state(struct
drm_device *dev,
}
return 0;
+
+free_encoder:
+ kfree(config->save_encoder_crtcs);
+free_crtc:
+ kfree(config->save_crtc_enabled);
+ return -ENOMEM;
}
static void intel_set_config_restore_state(struct drm_device *dev,
--
1.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
