Merge "drm/msm: free the IRQ during GPU cleanup"

This commit is contained in:
Linux Build Service Account 2017-08-08 16:24:54 -07:00 committed by Gerrit - the friendly Code Review server
commit fbf1286c9c

View file

@ -897,6 +897,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
ret = devm_request_irq(&pdev->dev, gpu->irq, irq_handler,
IRQF_TRIGGER_HIGH, gpu->name, gpu);
if (ret) {
gpu->irq = ret;
dev_err(drm->dev, "failed to request IRQ%u: %d\n", gpu->irq, ret);
goto fail;
}
@ -1007,6 +1008,11 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)
WARN_ON(!list_empty(&gpu->active_list));
if (gpu->irq >= 0) {
disable_irq(gpu->irq);
devm_free_irq(&pdev->dev, gpu->irq, gpu);
}
bs_fini(gpu);
for (i = 0; i < ARRAY_SIZE(gpu->rb); i++)