diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-07-04 17:16:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-04 17:16:41 -0700 |
| commit | c8e2ca30fdba613c088ab2fd5ac7b9c69b402559 (patch) | |
| tree | 67f6c1c8087f1e4c7470ef4edc67048c8a93fc6b /drivers/net/ethernet/freescale/fman/fman.c | |
| parent | fsl/fman: fix error handling (diff) | |
| download | linux-dev-c8e2ca30fdba613c088ab2fd5ac7b9c69b402559.tar.xz linux-dev-c8e2ca30fdba613c088ab2fd5ac7b9c69b402559.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/fman.c | 2 |
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) /* 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__); |