From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034360AbcIVSiQ (ORCPT ); Thu, 22 Sep 2016 14:38:16 -0400 Received: from mout.web.de ([212.227.15.4]:49515 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030338AbcIVRo0 (ORCPT ); Thu, 22 Sep 2016 13:44:26 -0400 Subject: [PATCH 12/14] GPU-DRM-TTM: Less function calls in ttm_dma_pool_init() after error detection To: dri-devel@lists.freedesktop.org, Daniel Vetter , David Airlie , Emil Velikov References: <566ABCD9.1060404@users.sourceforge.net> <4d34446f-05ad-c3ce-5d33-8fb4f25af25c@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Thu, 22 Sep 2016 19:44:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <4d34446f-05ad-c3ce-5d33-8fb4f25af25c@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:3d8sqi5GMnlEnJw52AxeQ/thZ8luyC+C0o2MMo5d3Jv1qYbiYVE rmAkSO6CWcMILqfRDoE2mfmdGBu8QntnbJXGgaKxkTY3sA4zYiRN08wwsRiVb4oz+hcVuHI 5sc21NASNosmT7y/5Iywclcvr0W7vzyhu78LekVLxomn9A3UOWledGteTen00FvsfaS1WY5 kW0hovLVJ5vwyogc9N4fA== X-UI-Out-Filterresults: notjunk:1;V01:K0:KSEk1Fel6gA=:pg+B6dTQiwNI0wR1sLVNST 1vb/Zxar5wfD3qx0d6a3mtrrD0B185J1ocsSVI6vwJ8hWDl8yZ2XB+ulNcyJlfAKM/RWsUWLl wlWCseDZChGJ/LWGFC4HQwnZNAcEeKeEs45Kmn5O5fF2z7zdt6Y6QL45qeE4wtHPDZA0E/mvO ZRVEDkwQJ07ut/XMdTG2vGo+PdYnkY4L5SaLqHdo3V8T/s7iyw2eNTx6st6uZP2Nr/5vtl0vD gkaDsTpRP3cmXmaJKdlAn5FrU8BIXHVhhF0amJZaI4QVSAQl19NcPU4mj3YfmJaOjLrJnJ4nh 3AWah5U38loipg/xe8nA3fwdC6wNN3Xj8nMSZDHRhvJ+0oYblhSb19Ouity9y+Eqnueya5H17 RIKNQdUEpQJLR6e9rgO6179z0e1s2VLVn7OxHV7FRZJz3ceSOGg58FUuLOzgsUoAJTNMfvCXA VhuM0OZrVCUkB3rxfGjfSdbOSIfS+ZYYzjBhD05AG1qC6Lsd8SejItZXq3gsoxJ1kBmxAIpo0 6xT4o+4y1mjCKMIUxDH2bTzoVNtmGQfFy2234BQpwlCG61KnQuUJaElydLdLqE7NmUb+mSPAk 8yvmjW5AhoClRwpGPBuZpWljLMms4+dpIECe0eYkLGW0gH8UWn5aQl30k6oNyovMPh+HNCXfs 2Upj/tpMCMBb0mYEmPbeljpNGeN6cQrkqoRdb0Wz1F0aZ7FUDGGQISOFovxKQsKUWlV3Q7WMA 632ZhGtTIl3FUfQC964WGY7JSjrzPgjUwjiO6E7IQFz4Ju2LQYYYvO3gswhSsPtui5SWaLDzy DYefaGg Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 22 Sep 2016 17:30:52 +0200 The kfree() function was called in up to two cases by the ttm_dma_pool_init() function during error handling even if the passed variable contained a null pointer. Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index d5f41ed..4c50196 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -591,12 +591,12 @@ static struct dma_pool *ttm_dma_pool_init(struct device *dev, gfp_t flags, pool = kmalloc_node(sizeof(struct dma_pool), GFP_KERNEL, dev_to_node(dev)); if (!pool) - goto err_mem; + goto free_devres; sec_pool = kmalloc_node(sizeof(struct device_pools), GFP_KERNEL, dev_to_node(dev)); if (!sec_pool) - goto err_mem; + goto free_pool; INIT_LIST_HEAD(&sec_pool->pools); sec_pool->dev = dev; @@ -637,10 +637,10 @@ static struct dma_pool *ttm_dma_pool_init(struct device *dev, gfp_t flags, devres_add(dev, ptr); return pool; -err_mem: - devres_free(ptr); - kfree(sec_pool); + free_pool: kfree(pool); + free_devres: + devres_free(ptr); return ERR_PTR(-ENOMEM); } -- 2.10.0