diff options
Diffstat (limited to 'drivers/media/video/pxa_camera.c')
-rw-r--r-- | drivers/media/video/pxa_camera.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index c1ee09a043ba..b42bfa5ccdf2 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -1155,15 +1155,11 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) | |||
1155 | struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); | 1155 | struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); |
1156 | struct pxa_camera_dev *pcdev = ici->priv; | 1156 | struct pxa_camera_dev *pcdev = ici->priv; |
1157 | unsigned long bus_flags, camera_flags, common_flags; | 1157 | unsigned long bus_flags, camera_flags, common_flags; |
1158 | const struct soc_mbus_pixelfmt *fmt; | ||
1159 | int ret; | 1158 | int ret; |
1160 | struct pxa_cam *cam = icd->host_priv; | 1159 | struct pxa_cam *cam = icd->host_priv; |
1161 | 1160 | ||
1162 | fmt = soc_mbus_get_fmtdesc(icd->current_fmt->code); | 1161 | ret = test_platform_param(pcdev, icd->current_fmt->host_fmt->bits_per_sample, |
1163 | if (!fmt) | 1162 | &bus_flags); |
1164 | return -EINVAL; | ||
1165 | |||
1166 | ret = test_platform_param(pcdev, fmt->bits_per_sample, &bus_flags); | ||
1167 | if (ret < 0) | 1163 | if (ret < 0) |
1168 | return ret; | 1164 | return ret; |
1169 | 1165 | ||