[media] smiapp: Return correct return value in smiapp_registered()

Prepare for supporting systems using the Device tree. Should the resources
not be available at the time of driver probe(), the EPROBE_DEFER error code
must be also returned from its probe function.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 8d01711eec4b0b9e9f0d7080af57aee02a069fd5..06fb03291d5908043c4cf8e80cf013b99e1e1ed7 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2358,14 +2358,14 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
        sensor->vana = devm_regulator_get(&client->dev, "vana");
        if (IS_ERR(sensor->vana)) {
                dev_err(&client->dev, "could not get regulator for vana\n");
-               return -ENODEV;
+               return PTR_ERR(sensor->vana);
        }
 
        if (!sensor->platform_data->set_xclk) {
                sensor->ext_clk = devm_clk_get(&client->dev, "ext_clk");
                if (IS_ERR(sensor->ext_clk)) {
                        dev_err(&client->dev, "could not get clock\n");
-                       return -ENODEV;
+                       return PTR_ERR(sensor->ext_clk);
                }
 
                rval = clk_set_rate(sensor->ext_clk,
@@ -2374,18 +2374,19 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                        dev_err(&client->dev,
                                "unable to set clock freq to %u\n",
                                sensor->platform_data->ext_clk);
-                       return -ENODEV;
+                       return rval;
                }
        }
 
        if (gpio_is_valid(sensor->platform_data->xshutdown)) {
-               if (devm_gpio_request_one(&client->dev,
-                                         sensor->platform_data->xshutdown, 0,
-                                         "SMIA++ xshutdown") != 0) {
+               rval = devm_gpio_request_one(
+                       &client->dev, sensor->platform_data->xshutdown, 0,
+                       "SMIA++ xshutdown");
+               if (rval < 0) {
                        dev_err(&client->dev,
                                "unable to acquire reset gpio %d\n",
                                sensor->platform_data->xshutdown);
-                       return -ENODEV;
+                       return rval;
                }
        }