From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753516AbbJMXTt (ORCPT ); Tue, 13 Oct 2015 19:19:49 -0400 Received: from mail-bl2on0108.outbound.protection.outlook.com ([65.55.169.108]:33600 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932242AbbJMXSh (ORCPT ); Tue, 13 Oct 2015 19:18:37 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: "J. German Rivera" To: , , , CC: , , , , , , , , , , , , "J. German Rivera" Subject: [PATCH 08/12] staging: fsl-mc: Fixed bug in fsl_mc_allocator_remove Date: Tue, 13 Oct 2015 18:03:28 -0500 Message-ID: <1444777412-5401-9-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1444777412-5401-1-git-send-email-German.Rivera@freescale.com> References: <1444777412-5401-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC005;1:hRKYQJwzYlgB8+hRgnSw8gv96Q385f2VlLoKVbBPKONt9pNlByqcjTx704LW2aXnbaUfXirN7bhZ4mo37MHqDzUp/L/aSyAsBzRoqK350FclPl0HrBVf963wRb42RyslRZuUkEyQPyt/dFoPskU65FutL4om51SGsFwkefxA9N7a8gTUXHxq+miSypd5SbODrore/CUy9GvPjn4/7V0lAtOJ4L/1rPIrThPpfyLtvVNRokBcteNGjGmHbkWn7QyuD1fH+y1Dv0LPVjzugCA7xlzSrh9pJd52rRk4FPhM/HlYS04+z1RAoJv9u2ZwGkS+iqG+bWC6H9CzXrlIx5dw7cLedh8dI9sAkgcFDR9K9zTl1UQ6cM6T9la4Goc8QnvTt54JP4Xflne4+CVrm/dXww== X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(97736004)(77096005)(5007970100001)(64706001)(81156007)(47776003)(5001770100001)(50226001)(48376002)(36756003)(5003940100001)(92566002)(2950100001)(5008740100001)(86362001)(107886002)(229853001)(76176999)(46102003)(106466001)(6806005)(5001960100002)(189998001)(50986999)(104016004)(50466002)(11100500001)(19580395003)(87936001)(69596002)(105606002)(2201001)(85426001)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0301MB1307;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1307;2:yf04xAQ4BReKSsK6qFBSn7lG8SSnj6d38m95CmhMeZIrugqvS13HuGWinOHBeGew8rS2Vq2aCH3MBMJupITUk3eUdPJQFYQG4lZOG9oup2sXS7B+7EHltLDN0+lfpvChOB+5xvbIqJ/MhleOlCPkMpdPMUPCDCKlBFxyd+eSPEg=;3:VT9esRpSZBSp5ZbuoerWmw0Ku0pwL8x1q83MxLuyJfYMyCezDyownbnxmOv7nlV5z2BA3FJneB13LVtADwGNn+KD55knQ7zxw8+ocXwiw/VkEshcxBrFRYF0DFIypSExtgX7buMZPyZXIwB5f5n8+ARswes34qvTaKTjE20/HmDc8xw5Xvxk/4YaoDsOU8813a78CGT/uYwdgmkHzJjboG9OkY9Jp9ENg5rjCwhb0SM=;25:zrE2+8dF0r0PjRSSRMKcRdTMgzSUveH1wL3eto43btwoYjariVuU7cxWyqIT5GwVEQMTqfKtRegwX28xrmk5G2tUvbTUrQpLKIG0bbqj7p3c0TMlmWdwRAhW+a8mSF3y+Cmb1RrUbVJ67h6jNzLA5PoU+EjRqxZgxAHE/SFAhMbDcm+X9p5iq9TGVmG0QvvuX4cE0KT21cdP5P2SpeVaB7a5aEmdSQvB9TngWOUZi5IN4sXfgwltws6eQcnS0BIGyufSlVoAm9jbQK3Uo/Xj2g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1307; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1307;20:jMlvtv8cRiMU0BE5jxPgQvFxCOltl1q/zusheJdIMQ0x86hS8prDqyU5idAk/HrA194i/KUFk1V4m8zYcksB+ndkQZSFL4R4NiCwveFjbfSExXbmvAv/Dt1EMxD6ihIpjT8Dlt35E4kFNa59XckfhEcrGpr1FFirL47c6c6SGPzJE2TPKDk6Nx+I4tuJj2PdVV/edT1eSDAeFwQva67vWt0LiamlSJRvqNg/84HGbOycD6wus8iD6+vcaxVsjAZb4jNZ1dkk9K7Qf7sAQoZMPujSNLnToDu+kEihKr6jg/6utCPSlIaT+pppKfplovmqAnwwohwPqsy0TwnUq37qq/THQ3/Jb2WUPSiXxhW9lRI=;4:1i+jIsFbj65kc/Re2MRPWi9uqulQVqxwModufOF/IRkwzY9iDEmNbEXLVV+acGhmgOm9lPEszr2OxB0cHEyta9WJ1EXyMxNdqFNXGQpuMg/K4ZBt+VoxIFGGH/0v6hRZdqgWSD67dHVEQjzwoKWAfJgLEGcm2R7i7MinUtAmzK0Le/+N+1Ynerj7v9MLcXZMg6maENNWizPAOQeA3tBSPzalzVhOmLQQHiuny4gQGjm8q8k7vleYmnxDR3HNxD4unqMbYwkNYOTqr1NRcaMd/VU2uqU2zDXS3lGCaZDtbEDR6kJTy3X0MAQfKPsbxCIHBWHqNVXr0HhCLdr60icwZH/IEusREOlxP0RkYXnG8Ws= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001);SRVR:CY1PR0301MB1307;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1307; X-Forefront-PRVS: 07283408BE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1307;23:KxXfF82xVEfquu9XVLEevVLtO6acqh3pxOqCT3e?= =?us-ascii?Q?qoXl8Byla2tcCV87nyz7en1E8jkk4vj6Wb6DXCOSIrm4wG8RZB6TOn+GSk0Q?= =?us-ascii?Q?Wcr2dM4+Ky8uYf8W6Y8W+qd0CmfXB3V4pHyZb771uCGR0+EhtKReNvWfk3Cr?= =?us-ascii?Q?z+gkKKixA+OSsLPyDEvSyE10eMceisn4hjzDzQqB5imKNB2YgwWAQ05dQNiL?= =?us-ascii?Q?YKLmis5zkKR/kyCWpvnB9jNbQnJ9bXe30BqpMlsCta6yllC6gAZ3Q66kNL1J?= =?us-ascii?Q?7A/URKpJoWzjQyX5ogv9Ivl62ZpAV+Tekr52lPStSYuuVpizDFGZoFDlLKKK?= =?us-ascii?Q?66sac3v8nJ1dzA80G8MDftSp5JUkPqhCiWdGWFN0KW194rlqP49KplEBhQDJ?= =?us-ascii?Q?Dhhzcvq5wKjAwyOd8xL5zDEb0EmC49aZMHpp1gEKDp6aAJWS5kSAPQRJe4Kx?= =?us-ascii?Q?9e+qS6ZMISaUBiC0T+k46NXJ4cHG7iZ0GyVf9OedxeVLyX5LoQKjxv1jlY75?= =?us-ascii?Q?HLv5cyZS2uWsrJ0IX7aJOQxa5iXr8pbg/92aUeLNnw+qaougjVRlJv++kJHm?= =?us-ascii?Q?52hE/Wklng2CTS6EPrVzLpBUayCwTrYJ40fwsAY1WcqznBjGGzRiWEHwQPgT?= =?us-ascii?Q?3GaYNxjRuY5Ok+ELdpp/8qNbOz7bWq3uM/rFam2oJO0yiEO8GSnJ2DxuEbRj?= =?us-ascii?Q?qT7M9KuzP6rJ16XoD72U75cNvRl7rw1nsAPJq0Op6yNdfrO3SF4ebazEs91O?= =?us-ascii?Q?Ypej8X7S3DzoUOe08YmrmfzeulIcMQsWbv3kjbIZihGe9z4+dfTrtlUSH8fu?= =?us-ascii?Q?RnCx13DTkQ3U/B3HhGZoIrTKHoCRIHvNwpoPj2oIzCXiWtHdayriy56TxWjK?= =?us-ascii?Q?+1foTbThcqVY6GegLUKujzT7T1L6+OEKDCKToLWZviicfl1jrdX2ForTxZd3?= =?us-ascii?Q?qeF/RvIfJJlnRVhs/ZZeJ4z/YKo+tGEvUpnWqI9h5e0Pcs5saGMzPjE1gjv9?= =?us-ascii?Q?Hfim143SLEqxAOG/QZGOvLjcFAZlVSRDvUyo+5jj1Wh8unjk4qmcmJtqCwm5?= =?us-ascii?Q?ibZsZEMOIgBmD7njp9AvUU/4z3fK5YkLLFD4V4Nfj7hKBg5A7Kh3GvURXuR3?= =?us-ascii?Q?tR4ymPhiqshM=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1307;5:jlAv+zAz8+uMP/p/UhPTD9x0ZHfm6GIYttQ0e3DiK/XHm9oqB/Y8DtZMSSG88b04SedPj0cysbDWxCpuUuN7q+TpD1tWaCH9Pk0sLGxNGJSxfiqqUoG+ffN9bYsO1qfjAG/mWmQCZ7LkTpihoVc5nA==;24:J+kuUVnK9TMUSQFQy2Wq00bHheFQQRAO7j0cnAw8UXwAxLfXPvf1/S7VhjEwgPvnsJXKDSOo0utMdI7L3MdCpCumF6P8BxMroZT4lsKcjtQ=;20:0UhAQKGhWLOohWrF+OkDbt6fbE/LOkuNJ2/hVtRE0YWjhwNHdApAz3i+naXodd71co8N5uEbUDk9k4bF4KP1Yw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2015 23:18:32.8455 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1307 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Call fsl_mc_resource_pool_remove_device() only if mc_dev->resource is not NULL. --- drivers/staging/fsl-mc/bus/mc-allocator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c index 527cb4b..e9c3dec 100644 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c @@ -511,9 +511,11 @@ static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev) if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type))) goto out; - error = fsl_mc_resource_pool_remove_device(mc_dev); - if (error < 0) - goto out; + if (mc_dev->resource) { + error = fsl_mc_resource_pool_remove_device(mc_dev); + if (error < 0) + goto out; + } dev_dbg(&mc_dev->dev, "Allocatable MC object device unbound from fsl_mc_allocator driver"); -- 2.3.3