From: J. German Rivera Date: Sat, 17 Oct 2015 16:18:22 +0000 (-0500) Subject: staging: fsl-mc: Fixed WARN_ON() in fsl_mc_resource_pool_remove_device X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2379bdbc6c37ad9db6538dbe8f56f18968b566ad;p=deliverable%2Flinux.git staging: fsl-mc: Fixed WARN_ON() in fsl_mc_resource_pool_remove_device Check that resource is not NULL before de-referencing it. Signed-off-by: J. German Rivera Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c index a45293bfce5a..88d1857521a5 100644 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c @@ -111,7 +111,7 @@ static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device goto out; resource = mc_dev->resource; - if (WARN_ON(resource->data != mc_dev)) + if (WARN_ON(!resource || resource->data != mc_dev)) goto out; mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);