Merge tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[karo-tx-linux.git] / drivers / media / i2c / smiapp / smiapp-core.c

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 06fb03291d5908043c4cf8e80cf013b99e1e1ed7..1eaf975d3612331ce6c74eb2ba1636904c19d154 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -297,8 +297,8 @@ static int smiapp_pll_update(struct smiapp_sensor *sensor)
        if (rval < 0)
                return rval;
 
-       sensor->pixel_rate_parray->cur.val64 = pll->vt_pix_clk_freq_hz;
-       sensor->pixel_rate_csi->cur.val64 = pll->pixel_rate_csi;
+       *sensor->pixel_rate_parray->p_cur.p_s64 = pll->vt_pix_clk_freq_hz;
+       *sensor->pixel_rate_csi->p_cur.p_s64 = pll->pixel_rate_csi;
 
        return 0;
 }
@@ -533,7 +533,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
 
        sensor->pixel_rate_parray = v4l2_ctrl_new_std(
                &sensor->pixel_array->ctrl_handler, &smiapp_ctrl_ops,
-               V4L2_CID_PIXEL_RATE, 0, 0, 1, 0);
+               V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1);
 
        if (sensor->pixel_array->ctrl_handler.error) {
                dev_err(&client->dev,
@@ -562,7 +562,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
 
        sensor->pixel_rate_csi = v4l2_ctrl_new_std(
                &sensor->src->ctrl_handler, &smiapp_ctrl_ops,
-               V4L2_CID_PIXEL_RATE, 0, 0, 1, 0);
+               V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1);
 
        if (sensor->src->ctrl_handler.error) {
                dev_err(&client->dev,
@@ -1554,6 +1554,7 @@ static int __smiapp_get_format(struct v4l2_subdev *subdev,
                fmt->format.code = __smiapp_get_mbus_code(subdev, fmt->pad);
                fmt->format.width = r->width;
                fmt->format.height = r->height;
+               fmt->format.field = V4L2_FIELD_NONE;
        }
 
        return 0;
@@ -1687,6 +1688,7 @@ static int smiapp_set_format(struct v4l2_subdev *subdev,
        fmt->format.code = __smiapp_get_mbus_code(subdev, fmt->pad);
        fmt->format.width &= ~1;
        fmt->format.height &= ~1;
+       fmt->format.field = V4L2_FIELD_NONE;
 
        fmt->format.width =
                clamp(fmt->format.width,
@@ -2544,9 +2546,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                }
 
                snprintf(this->sd.name,
-                        sizeof(this->sd.name), "%s %d-%4.4x %s",
-                        sensor->minfo.name, i2c_adapter_id(client->adapter),
-                        client->addr, _this->name);
+                        sizeof(this->sd.name), "%s %s %d-%4.4x",
+                        sensor->minfo.name, _this->name,
+                        i2c_adapter_id(client->adapter), client->addr);
 
                this->sink_fmt.width =
                        sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
@@ -2674,6 +2676,7 @@ static int smiapp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
                try_fmt->width = sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
                try_fmt->height = sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1;
                try_fmt->code = mbus_code;
+               try_fmt->field = V4L2_FIELD_NONE;
 
                try_crop->top = 0;
                try_crop->left = 0;