diff options
Diffstat (limited to 'drivers/media/platform/coda/coda-bit.c')
-rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 0073f5a5b86c..23041587c898 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c | |||
@@ -402,10 +402,8 @@ static int coda_alloc_context_buffers(struct coda_ctx *ctx, | |||
402 | if (!ctx->parabuf.vaddr) { | 402 | if (!ctx->parabuf.vaddr) { |
403 | ret = coda_alloc_context_buf(ctx, &ctx->parabuf, | 403 | ret = coda_alloc_context_buf(ctx, &ctx->parabuf, |
404 | CODA_PARA_BUF_SIZE, "parabuf"); | 404 | CODA_PARA_BUF_SIZE, "parabuf"); |
405 | if (ret < 0) { | 405 | if (ret < 0) |
406 | v4l2_err(&dev->v4l2_dev, "failed to allocate parabuf"); | ||
407 | return ret; | 406 | return ret; |
408 | } | ||
409 | } | 407 | } |
410 | 408 | ||
411 | if (dev->devtype->product == CODA_DX6) | 409 | if (dev->devtype->product == CODA_DX6) |
@@ -417,22 +415,15 @@ static int coda_alloc_context_buffers(struct coda_ctx *ctx, | |||
417 | DIV_ROUND_UP(q_data->height, 16)) * 3200 / 8 + 512; | 415 | DIV_ROUND_UP(q_data->height, 16)) * 3200 / 8 + 512; |
418 | ret = coda_alloc_context_buf(ctx, &ctx->slicebuf, size, | 416 | ret = coda_alloc_context_buf(ctx, &ctx->slicebuf, size, |
419 | "slicebuf"); | 417 | "slicebuf"); |
420 | if (ret < 0) { | 418 | if (ret < 0) |
421 | v4l2_err(&dev->v4l2_dev, | ||
422 | "failed to allocate %d byte slice buffer", | ||
423 | ctx->slicebuf.size); | ||
424 | goto err; | 419 | goto err; |
425 | } | ||
426 | } | 420 | } |
427 | 421 | ||
428 | if (!ctx->psbuf.vaddr && dev->devtype->product == CODA_7541) { | 422 | if (!ctx->psbuf.vaddr && dev->devtype->product == CODA_7541) { |
429 | ret = coda_alloc_context_buf(ctx, &ctx->psbuf, | 423 | ret = coda_alloc_context_buf(ctx, &ctx->psbuf, |
430 | CODA7_PS_BUF_SIZE, "psbuf"); | 424 | CODA7_PS_BUF_SIZE, "psbuf"); |
431 | if (ret < 0) { | 425 | if (ret < 0) |
432 | v4l2_err(&dev->v4l2_dev, | ||
433 | "failed to allocate psmem buffer"); | ||
434 | goto err; | 426 | goto err; |
435 | } | ||
436 | } | 427 | } |
437 | 428 | ||
438 | if (!ctx->workbuf.vaddr) { | 429 | if (!ctx->workbuf.vaddr) { |
@@ -442,12 +433,8 @@ static int coda_alloc_context_buffers(struct coda_ctx *ctx, | |||
442 | size += CODA9_PS_SAVE_SIZE; | 433 | size += CODA9_PS_SAVE_SIZE; |
443 | ret = coda_alloc_context_buf(ctx, &ctx->workbuf, size, | 434 | ret = coda_alloc_context_buf(ctx, &ctx->workbuf, size, |
444 | "workbuf"); | 435 | "workbuf"); |
445 | if (ret < 0) { | 436 | if (ret < 0) |
446 | v4l2_err(&dev->v4l2_dev, | ||
447 | "failed to allocate %d byte context buffer", | ||
448 | ctx->workbuf.size); | ||
449 | goto err; | 437 | goto err; |
450 | } | ||
451 | } | 438 | } |
452 | 439 | ||
453 | return 0; | 440 | return 0; |