diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-17 08:30:54 +0100 |
| commit | 89a01c51cbe3b6ae81008e8c91235be583df8c50 (patch) | |
| tree | 0f2e42652d8ebdfc6aeaa8f7c1b5b834f4a5d649 /drivers/gpu/ipu-v3/ipu-image-convert.c | |
| parent | x86/dumpstack: Handle NULL stack pointer in show_trace_log_lvl() (diff) | |
| parent | x86/cpufeatures: Enable new AVX512 cpu features (diff) | |
| download | linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.tar.xz linux-89a01c51cbe3b6ae81008e8c91235be583df8c50.zip | |
Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/ipu-v3/ipu-image-convert.c')
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-image-convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c index 2ba7d437a2af..805b6fa7b5f4 100644 --- a/drivers/gpu/ipu-v3/ipu-image-convert.c +++ b/drivers/gpu/ipu-v3/ipu-image-convert.c @@ -1617,7 +1617,7 @@ ipu_image_convert(struct ipu_soc *ipu, enum ipu_ic_task ic_task, ctx = ipu_image_convert_prepare(ipu, ic_task, in, out, rot_mode, complete, complete_context); if (IS_ERR(ctx)) - return ERR_PTR(PTR_ERR(ctx)); + return ERR_CAST(ctx); run = kzalloc(sizeof(*run), GFP_KERNEL); if (!run) { |