From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753306AbbJQQet (ORCPT ); Sat, 17 Oct 2015 12:34:49 -0400 Received: from mail-by2on0145.outbound.protection.outlook.com ([207.46.100.145]:4800 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752941AbbJQQd3 (ORCPT ); Sat, 17 Oct 2015 12:33:29 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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 v3 08/12] staging: fsl-mc: Fixed bug in fsl_mc_allocator_remove Date: Sat, 17 Oct 2015 11:18:20 -0500 Message-ID: <1445098704-11708-9-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1445098704-11708-1-git-send-email-German.Rivera@freescale.com> References: <1445098704-11708-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD037;1:pOrZKkAPzPxtYFjGHAkg1d/4pVvNOl2p+X2DUy5Cr+CjO+fVWiCXskSZS6iNpATCTx6IUeZ6OXPaHKsOwHCKxg1IIzD4Z1aSnxX8DXAeTkXJriWUedOISynR1LLRHybWgOIAeVek2glXXh2ANrgWxHauXQVeQ1K1cJgTLCltyV3213tHq1vSxrKY0r7wQZ9ilf61eLiPWdRHuzm9rg56ozjg81VdoXgogxxgaOrVxHGKM+rI2K4mqqHfupnSbGjdU16oWZ2z3jsn4hHrQQQeyln96oXg5vpOi35BSOZj7L0T6FhkhKU4qf1JIaDlQN4zf5iP4MzMF+9BBIPnTtBqKgLLOhDCQagT4oJIEdRbI80XhBY8PHLwVl6ZvziiqjidZDzgZcmf3yVdplP02acfnw== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(87936001)(5003940100001)(50466002)(97736004)(2201001)(105606002)(81156007)(5001770100001)(48376002)(189998001)(19580405001)(5007970100001)(229853001)(5008740100001)(106466001)(64706001)(107886002)(6806005)(5001960100002)(92566002)(77096005)(2950100001)(76176999)(47776003)(50986999)(50226001)(86362001)(46102003)(85426001)(19580395003)(36756003)(104016004)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB505;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB505;2:4PbEELbUHucYkuj6Lt5JCzzgC8YgA2JtTyk/ebqqxsjH6MOaIATdgtiLKgFwBL38Jp0qXVnZT8ERNMDnwwl9s6iejhMWDVn64c+wK0QMfXWzcss8IdBn1UP4VBpmLihZXWoBkGK2IqGi/Zb2yR4iUAz+lJ+hjA2BUwQjqJSorg8=;3:qi7qXGVpxkblmTlH/gcRC9pRJUM3XU5PQJGQTiWsim7jmFv2b/uZXFufdgzBIQXu+dpB9kD7BdSYfYl2Cyqqiq78P2EZa9+xwC5Cbhe1KZ26gF5glXyNV3wZ9u4tKyZSTMR29z4f0ZqrbQl2Wl4eE5ODkI6JV+8MgKoGJX2Kj4PXDqbiAMkxadq5Hg0nuzmDeyCqkNuJqk16ycZhNvVbOt5/Q1mWSUtcdKXlUmPDLqM=;25:fIldzOEjp98HbSEfxYphfcU10adxHVH3wuL71nO0z2ABlFv5b1P78VlsdzzrYosqOJeNkJrnlXSvV/4TGIuf8xR9YvIgoWXdL2OjQPwy92aVuDT86l48s/HzlYkibzfAGgHXeuDkKNpUisCl89oT9fuQ9AVcRSpTeFbkOAU+sER+xGvwuYpU5XQbTtCjnpV9RtNL0kQ3tUYTlph3VURIUSGRiR1mRyriLPEy4gmjRklSH3bTVDhEJkmx6iAGxvV+GMgO+94Kvxmay3ip6pDdDA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB505; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB505;20:hGhAy7WuEkmY/eDWUhEUJ9rb8IJnU0w2YHwhVmgVlSkjfGCWknAZS2/20ZRXMVsJZ5RgiL4kgHPCcXnOH8/Qdju/h2sfv9DkfW9iHv7a9fW1mBdTBYtGHJcMvR44fa71qHUwlDmA2aInKHtwHqZvHNVHnga5d46Wyu1KVKCRD7g1U0PgMHRuH4LevamQDtaY2E8dRsZxVIrWjkEJZlQ31iCoJCRJ9kAT1dPUE/1Ds1dCEsLExsiv5xLPlL7pyl3Y7PMlDlVCnpgXGd0tE9w80CwW7hrO64H0JEUERQtqM5vrGxWIl6HJByLSzy2/fLa0b4MH2dmaseAD/PHizVbDFLf+TL2ikym+Cfn3XxVZTXw=;4:+8uYkg9ySm6vlqLLb7mmdOap+FyTDgqnGRJanPAXvNe97mzl1fCxv61d5b+KyzAn1QOciByPsS/PvMA2gHU1o6P9wH3rLL+EbB59LLFCfklJ1zMdEVlVXYp2LFbV53whZeIAhfn/riT+Ns05jC4jT4mvTcaC6Gc+PR9fmha2Yqcs1c4cox90PNK76JOEQBHcmBMcmy8Rnfe2voTCSwp902IAk4ZYbGi/30EN8R4EbYwCHs4sGn1oso2MmCH//MId6zlZS4XWChylzhb9lnz2bezm/k0zO22lsQp5dvW08u1PbUYg2WvdlaP/YQMTL3O6pyfzYBtZQqrKoKSrtmQDZOJFCLKlig75VFB3LxSNIgw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(520078)(3002001);SRVR:BY2PR03MB505;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB505; X-Forefront-PRVS: 07326CFBC4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB505;23:SgCHJv7JgN61hqSX8txKd3OGyGgTzHF9H7UnyRa5fO?= =?us-ascii?Q?2a3168CYQUWBK530CIcWkTgZz/Ri9BS5UX+j+Hq9Jt6sdHle8lxqgCuiZmQI?= =?us-ascii?Q?HUSqNosaVGGxdDBRrYGu0sfmhq9txkB6j47MAZ+QRos/2heAKdw4hyJqHVgQ?= =?us-ascii?Q?LWfacVFEENbSwa059kILAWJiZxy1MJJEXyEtUo1vzyKGyszzwHkGbsayy3hA?= =?us-ascii?Q?wq8k2cRwDIdwlST79CCc8Ed1qJvqoeRahvsyfbsvgeMZ5D4fZs8gYtQb6o1K?= =?us-ascii?Q?pVnWlhsiJQDgreaEY1IUVIYVRZ2mniNF/E6BbQis5jN6s9lT0PehYkGJEQtz?= =?us-ascii?Q?EN2P+jJTfQANIS7MW7URJciuHZcvI1oJN+uCVBrwtN5xQwOKdTodwAoyETlf?= =?us-ascii?Q?fUkmfMws86GHdBzBQMXNZSuE78I4xOjg0WgB3fM2rJb9TG2nafP1y6Irav1E?= =?us-ascii?Q?x+pL/b6KXaHtZXJaVZmy2oeiu3aLQXZyn1SZ0FWofSotW3wRviZp06yS5vyE?= =?us-ascii?Q?9jMV0fQz7c6P5gSK8kS+N4wGoZ5LVJzPBEn83Uy2Go5lb0kcYgEllRsbOTzX?= =?us-ascii?Q?Afy1HqEFlStf7uiIQzMVwJe2qsmMA2Sj9pURqDp+P2EABmuaJH4nq1nE94WE?= =?us-ascii?Q?PKbeERUXrCqGB+70UMtngmo3wtM4tLOMgJe8Zr3jqXxV0RiQZHMF8n+rCESr?= =?us-ascii?Q?fsKmKUZfva6pgD+WRYjr0/mgUReRpHDEYjrVLzfo1MGNM5n7OlTqBSXTzwrK?= =?us-ascii?Q?g32mEzy4kSc3C+cU1bExbKv6m/SnPzInmnx/+gvPvlzbR1oA2iyfJZFfU8XC?= =?us-ascii?Q?6Ooay5Cc0McPm3j3zRGhCMpkpCy0hHlITzjXbLqth3TZ4skAxzY3PFusNCyA?= =?us-ascii?Q?v/WNvt0atmwLWGD4a3jEL62pxEkkScEYSo6Z/gnifewpoQN9bJyRmdjof3Lz?= =?us-ascii?Q?cY1+YQDiax56+XQPqnOVNVMy7dii5d9Gsd/DDW6qZEg0XGgU6IYNI4I95wDX?= =?us-ascii?Q?MzloGt+8UwusB/9jVGQktRtWFdSOjd3AQeeCF4zT5Y7QDK1D7szVN2Pk949C?= =?us-ascii?Q?5Me4/XBPnA/wqBhs17dl2QJfJLOfXahTSFqH1eNzM3a/DZpg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB505;5:VQup/PfQ9ShfWPlg+eNdT7pFa2HjSKV0LEslNL4F/h2ODKbte04jRB4MYQhwFsqvJnaG2377+527dpsBUU4Wwsb6uV99r94LHezNBGt1r75m8wpRnZ3Z2uafJIkmS6sQyv+UWYuDodEJrs656nQSHw==;24:29hNbuN6WwLSbARt4RbjnwxA/9yReZERuZn668Bp11PkgnK0DtgzEvU40PjnzFYqB/ERLNZ/w1e+wM/TeulF5UuGQyw9y6dRha3T4qnlSzg=;20:Af9D9h/Mncy+K7sWnA+BTvhb4pxD5cDF4b6+0CnaxMHeFrsin+szpRPcZtOJX58PiHHS3OacLpPh1reHPuJKFg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2015 16:33:25.6955 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB505 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. Signed-off-by: J. German Rivera --- CHANGE HISTORY Changes in v3: - Added missing signed-off-by 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