Since insert_resource() might return an error we don't need
to shadow its error code and would safely propagate to the user.

Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
---
- move an assignment to the separate line inside first branch (Rafael)

 drivers/base/platform.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index dab0a5abc391..9cf9e2af9efd 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -438,10 +438,12 @@ int platform_device_add(struct platform_device *pdev)
                                p = &ioport_resource;
                }
 
-               if (p && insert_resource(p, r)) {
-                       dev_err(&pdev->dev, "failed to claim resource %d: 
%pR\n", i, r);
-                       ret = -EBUSY;
-                       goto failed;
+               if (p) {
+                       ret = insert_resource(p, r);
+                       if (ret) {
+                               dev_err(&pdev->dev, "failed to claim resource 
%d: %pR\n", i, r);
+                               goto failed;
+                       }
                }
        }
 
-- 
2.20.1

Reply via email to