aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-07-04 20:16:41 -0400
committerDavid S. Miller <davem@davemloft.net>2016-07-04 20:16:41 -0400
commitc8e2ca30fdba613c088ab2fd5ac7b9c69b402559 (patch)
tree67f6c1c8087f1e4c7470ef4edc67048c8a93fc6b
parenta788a4a040e003574b8ad17115706ab1601ec572 (diff)
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 <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fman/fman.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index f634e769038e..1de2e1e51c2b 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)
2036 /* allocate MURAM for FIFO according to total size */ 2036 /* allocate MURAM for FIFO according to total size */
2037 fman->fifo_offset = fman_muram_alloc(fman->muram, 2037 fman->fifo_offset = fman_muram_alloc(fman->muram,
2038 fman->state->total_fifo_size); 2038 fman->state->total_fifo_size);
2039 if (IS_ERR_VALUE(fman->fifo_offset)) { 2039 if (IS_ERR_VALUE(fman->cam_offset)) {
2040 free_init_resources(fman); 2040 free_init_resources(fman);
2041 dev_err(fman->dev, "%s: MURAM alloc for BMI FIFO failed\n", 2041 dev_err(fman->dev, "%s: MURAM alloc for BMI FIFO failed\n",
2042 __func__); 2042 __func__);