On Wed, Apr 3, 2019 at 1:29 PM Andy Shevchenko <andriy.shevche...@linux.intel.com> wrote: > > On Tue, Apr 02, 2019 at 06:02:40PM +0200, Rafael J. Wysocki wrote: > > On Tue, Apr 2, 2019 at 5:59 PM Andy Shevchenko > > <andriy.shevche...@linux.intel.com> wrote: > > > > > > Since insert_resource() might return an error we don't need > > > to shadow its error code and would safely propagate to the user. > > > > - if (p && insert_resource(p, r)) { > > > + if (p && (ret = insert_resource(p, r))) { > > > > I would put the assignment here. > > > > > dev_err(&pdev->dev, "failed to claim resource %d: > > > %pR\n", i, r); > > > - ret = -EBUSY; > > > goto failed; > > > } > > Something like this?
Yes. > 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; > + } > } > } > > > -- > With Best Regards, > Andy Shevchenko > >