index 8e5353eb5a47e36dc20935fade92462a96e75178..ab0b961dd1dcaec00ab06e6a76e10dac9949df43 100644 (file)
if (fsize.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
if ((f->fmt.pix.width == fsize.discrete.width) &&
- (f->fmt.pix.height == fsize.discrete.height)) {
+ (((f->fmt.pix.field == V4L2_FIELD_ALTERNATE) ?
+ f->fmt.pix.height * 2 : f->fmt.pix.height) ==
+ fsize.discrete.height)) {
found = true;
break;
}
vip_set_slice_path(dev, VIP_MULTI_CHANNEL_DATA_SELECT);
}
- shared->vpdma = vpdma_create(pdev, vip_vpdma_fw_cb);
- if (!shared->vpdma) {
+ shared->vpdma = &shared->vpdma_data;
+ ret = vpdma_create(pdev, shared->vpdma, vip_vpdma_fw_cb);
+ if (ret) {
dev_err(&pdev->dev, "Creating VPDMA failed");
goto dev_unreg;
}