diff options
Diffstat (limited to 'drivers/media/platform/atmel/atmel-isi.c')
-rw-r--r-- | drivers/media/platform/atmel/atmel-isi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c index 891fa2505efa..154e9c39b64f 100644 --- a/drivers/media/platform/atmel/atmel-isi.c +++ b/drivers/media/platform/atmel/atmel-isi.c | |||
@@ -1038,10 +1038,8 @@ static int isi_formats_init(struct atmel_isi *isi) | |||
1038 | isi->user_formats = devm_kcalloc(isi->dev, | 1038 | isi->user_formats = devm_kcalloc(isi->dev, |
1039 | num_fmts, sizeof(struct isi_format *), | 1039 | num_fmts, sizeof(struct isi_format *), |
1040 | GFP_KERNEL); | 1040 | GFP_KERNEL); |
1041 | if (!isi->user_formats) { | 1041 | if (!isi->user_formats) |
1042 | dev_err(isi->dev, "could not allocate memory\n"); | ||
1043 | return -ENOMEM; | 1042 | return -ENOMEM; |
1044 | } | ||
1045 | 1043 | ||
1046 | memcpy(isi->user_formats, isi_fmts, | 1044 | memcpy(isi->user_formats, isi_fmts, |
1047 | num_fmts * sizeof(struct isi_format *)); | 1045 | num_fmts * sizeof(struct isi_format *)); |
@@ -1176,10 +1174,8 @@ static int atmel_isi_probe(struct platform_device *pdev) | |||
1176 | int ret, i; | 1174 | int ret, i; |
1177 | 1175 | ||
1178 | isi = devm_kzalloc(&pdev->dev, sizeof(struct atmel_isi), GFP_KERNEL); | 1176 | isi = devm_kzalloc(&pdev->dev, sizeof(struct atmel_isi), GFP_KERNEL); |
1179 | if (!isi) { | 1177 | if (!isi) |
1180 | dev_err(&pdev->dev, "Can't allocate interface!\n"); | ||
1181 | return -ENOMEM; | 1178 | return -ENOMEM; |
1182 | } | ||
1183 | 1179 | ||
1184 | isi->pclk = devm_clk_get(&pdev->dev, "isi_clk"); | 1180 | isi->pclk = devm_clk_get(&pdev->dev, "isi_clk"); |
1185 | if (IS_ERR(isi->pclk)) | 1181 | if (IS_ERR(isi->pclk)) |