From: David S. Miller Date: Tue, 5 Jul 2016 00:16:41 +0000 (-0700) Subject: Revert "fsl/fman: fix error handling" X-Git-Tag: v4.7-rc7~20^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8e2ca30fdba613c088ab2fd5ac7b9c69b402559;p=platform%2Fkernel%2Flinux-exynos.git Revert "fsl/fman: fix error handling" This reverts commit a788a4a040e003574b8ad17115706ab1601ec572. This patch is wrong, the type returned doesn't fit what the error pointer macros expect. Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index f634e769..1de2e1e 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -2036,7 +2036,7 @@ static int fman_init(struct fman *fman) /* allocate MURAM for FIFO according to total size */ fman->fifo_offset = fman_muram_alloc(fman->muram, fman->state->total_fifo_size); - if (IS_ERR_VALUE(fman->fifo_offset)) { + if (IS_ERR_VALUE(fman->cam_offset)) { free_init_resources(fman); dev_err(fman->dev, "%s: MURAM alloc for BMI FIFO failed\n", __func__);