From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754548AbbJNUMK (ORCPT ); Wed, 14 Oct 2015 16:12:10 -0400 Received: from mail-bn1on0137.outbound.protection.outlook.com ([157.56.110.137]:30607 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753614AbbJNUGy (ORCPT ); Wed, 14 Oct 2015 16:06:54 -0400 X-Greylist: delayed 74902 seconds by postgrey-1.27 at vger.kernel.org; Wed, 14 Oct 2015 16:06:54 EDT 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 v2 08/12] staging: fsl-mc: Fixed bug in fsl_mc_allocator_remove Date: Wed, 14 Oct 2015 14:51:47 -0500 Message-ID: <1444852311-673-9-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1444852311-673-1-git-send-email-German.Rivera@freescale.com> References: <1444852311-673-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD042;1:rkKjRpbbjL81fXmmIDVVTPT2alLoE7rMAYD8M0zuutZw079poPenjbRCMXK3d4hjD8XLGd3paMXj3SwWsL59+++Wl+T1Orh49F3HlByUMrW1EmlPo4+GGJhHaZS3ln0Vyq7VVdTU+6RFXmkRAwfg/0vHJksRU7bQjWapOrO/SMaVtzln1PILa3q1yXbZ0XMptiQjcE6sY8IVHNGeuszQTZPrMhvg8pOO0tHuEnFDa7a1Pt5DPC1n2KEpu4dUD1JXwgEpwor+1yUba2Z63Bo5KsTZkS6F/LDE6NzxIE/SNMVbx/WbbSJ1T/arJvZsTeKa4ldN+L+9CfJ8Z3aEPsoVLefuhSoOOE0iw+bhDCQTn26gZdrgdwIHjGNDeVuFgYALFaNqyGQKuRoXTDzdWrY+nQ== X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(5008740100001)(36756003)(92566002)(46102003)(50986999)(50226001)(104016004)(76176999)(5007970100001)(2950100001)(47776003)(229853001)(64706001)(6806005)(5001770100001)(106466001)(86362001)(81156007)(97736004)(19580395003)(189998001)(107886002)(5001960100002)(48376002)(105606002)(50466002)(5003940100001)(85426001)(2201001)(69596002)(77096005)(87936001)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR03MB499;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;BL2PR03MB499;2:zT8BPJ7lORww3rNKMK0WOtiFoxFhmdjdb9J7slH4RjDpWvNfg5e5nPurREtQfu/S3hLK4IGO8x5XO0XF9FJ+LXK6o0tiLLyjOixeirstVP0xruN2K/ad0UnjzfQ7YAXQXsUe6pH3cTeib2pY20HV0880UVJhHNLsTGKVNuJnzJA=;3:q7spWL7k2UCxcY3BLJmAO+ldwUtv+ExXw+Knhg4Eu1wCwFLgW6L3PPFy8Ph061uGB/0YI0wUezOm+aOgfiq5cvRXvWYGGLoUWu4rCWYn4VlhdIbJRWZfquSNPC1rXJ29WL+jXZDiLCc2ioozCTBb7TkXqHucSTsHBqSV7CV+mnEyJUZk6pSZlg3YjNSqu2El5/ehmSkHD96wiNUxfjKvvpth1I1ffVNXw870UDeiX8E=;25:InUXoQDKkZKKBRBe44G5hMy+020AhOrCwT2lR3XYth7+yZMaoE2Gqd9XwiHTdZnAIg8BlJTl2u1HE3lqAblvK7HIe8wWMCYX/IHUISgmymmJSo/6F5R4BLQfIh4GBEN8Snzcl96pQ0Xc4ZWO5O9+FFxT6o3lfpV96g4/3Of16YEOJrWIYika5Q/6qRV6Vts4RFiS035af3Hjxsmp8jSn6Pn+N0O28/KvgUu+aMY2fR2GIMCx6y26sDCIfkzNSFnbLIRPKNishkwyCMTvJ7O/yA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB499; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB499;20:rwFwgTjlsjUDIKxogSx5G0qBz/KGcbaUUKcAcAtdUEACKEvINiX7Cm9mqmN24lh2oKAYdZ03nGZ8V6FDJH1yrvNTMispG0AOCzjoBJbkWdczQyuosfxr6CCQh4Xn41I+vwPBqzBEZvRymNkhh7xLlUGxn5AFCCUFIuD/BT+HN5DE1Fyw8lJdDrHJM6RL4o7iP1shNkeBuOY0lQPvCV/GY3J3kK0/iIpkIT5nW603gEX96XH5n6tSY2vGYiNglkB9SCd6WkRFcOtUyPk0KHQIDRX1t7cLaoUorhwluvAE/jEM2PycHNjWCQ0ox/WKUDJuz1J1RtT7qSgi21c+xWWLkNc3Dc26vB2zco/trgts5aA=;4:top69wMCh93dRv/TikLH+dChQhK3pYUFCExmr7Oeg20RNv63KqKU8RW/lU4fTiGJfdva8kEc+eta67Uogau9wCPVcZBoo+IOGigTFeajJj3rveNC4algELyRv5ol8M8G1csPIWowZ+lQ3PuzS4j3DNPfnXU339d0DzKqSbm/ZryWY034I2xwjeXPsv3piUqQvOPQOaLH0ZoUzjtuqd1F6X8yNHKa/4NivbJVhUW7uZWXoSvjz7VBjaPIC/s+KFJE+4R2uAewpGCqCzhLNqKbeL6jtlDFt0GUaCl+sjnXdYjth7Dkvcyqld7Bb9Wum1SZIizz9IjWR8Ja5Zb/dI9/B7w0/szGrgAwdd2Hw4E6JcY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001);SRVR:BL2PR03MB499;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB499; X-Forefront-PRVS: 0729050452 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB499;23:J8gpim8urgfOVL1OBC4k6ogysF+dJ3P2jdUmhVQtJD?= =?us-ascii?Q?uXbpyZKwEEnWWpXPVRuPsSSslgDU5v/M928RCHPWaOmfD7NPgtgNvbltlJb7?= =?us-ascii?Q?cLT8Qe8NgWduha6MBIWKwfk4B62g/RXa9VKa2ErAbh3sfhtsBZYO1NIHWVu1?= =?us-ascii?Q?q6PEsQ2cicFbRneka+E5tF2nSYtWF8jM49fqkIXfLPnXWvgAphdIknf357Tm?= =?us-ascii?Q?rACRqsEbYyEinF4UY4Q8WG6+904HXoWpUyb9+ZWOsLXJiPe8jl3lE/Ac2y7C?= =?us-ascii?Q?TqWvNZvcQBrpSE1x3bfhxCDSYIRTpk2fLfEv8csa5Cl6c/hsQtMLznpRuAhw?= =?us-ascii?Q?UoSDXtMKP/PMIga4JVrWzORiNldi6ioVzhE7LOBX2sA51Z0nGCydYXcBSiqm?= =?us-ascii?Q?XNyNUqTy2ns7vP/JRi3tBmRby9vGnRc2qTKZCBfgNliQcNySyn2rc3KdUBfa?= =?us-ascii?Q?Zb7HODpYKOnIf5phmeZeikPERSQMSrMNTLaXbKmWW6Wl+gLo47kvZrxLBdQo?= =?us-ascii?Q?9AmWQyZviHZ9EK50bvt1ucuqfKiigzRjWE6k2Fb6cK/1GABvPEMObUEEWPN2?= =?us-ascii?Q?5hBynbBPDay2w45lJ2fO5cVavaBMNtnM8EGxI4KtqnFiy0+TrnsjkCyjfPYX?= =?us-ascii?Q?ZS0GKZx4pX1KvZiZXRZ3R3BAd4G9l7o4RYDpXNg/K5xAe0GGT3AQwCHQnz8Q?= =?us-ascii?Q?MxuMcrwQ30h9GwYdNygllFQwghoHHQqLhPpybD5jAlBD+RO69YphG1GyqHL/?= =?us-ascii?Q?NHKAEdssrJpqS0nVubFEThjKWVia3MFWrUJ7TaUMh6WQqFDeKjRWNnT5VFBs?= =?us-ascii?Q?9i1baBe7xDJTrfr2RG67bdEb+pRfNODXJ90dWyw5g8yg8poAwy62nG9Xz6NY?= =?us-ascii?Q?rYtuqqprG7Ep/DKMBhRm5MAZZmKHgLYcFB301z3lNNLnNIaJSnvaN5yJxMe+?= =?us-ascii?Q?XtHKBHOY1jgzj6sAC4oWEJHeSmrcXThqQybyQ6Ihyznv/xji9pGpjq7mmHId?= =?us-ascii?Q?c3Y9Oc0bFmZbVTn99gKHzaN7WIk2fSPZhoIFDskx+L86tRf+lDr4TJ8KA9hI?= =?us-ascii?Q?Y5NqQ6o9NdBsGWXSfFx5WLI5z0hfYxkvzw+2T7woUdVYfH8Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB499;5:SH2yTiB555IgpkLV1T4WadQrsCQeuBu5PK5Ho8IQ2R6FjhW6gTYsZI30tfl7yQ0O7H/2b14oTuowJA/qzkrQdugoYLGh/+Wwgff+AmCogd5Jr6U/RUsRa7TCsrhUwtUC5V4Ks4pf4fGuuusFaFFeiw==;24:6GNbu5zlIUnul1WsgLAi0lVDQsq/FjWWooM392nDXkcrOieZbbGkFpjwl+4m7alSZKJOIb/wQKVZMxFisZM8Jix3EID4jXXiLWR7NpLjtwo=;20:uQXqSP7gu1P5YPtYE3XwdQU4VHv6QfVRXwwIs4Eg7taflGoVEDuiKs8zmOysUSW7HuZ7u8J+i9k9MDu6ZSEKkg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2015 20:06:50.7541 (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: BL2PR03MB499 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. --- CHANGE HISTORY Changes in v2: none 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