Revert "fsl/fman: fix error handling"
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Jul 2016 00:16:41 +0000 (17:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jul 2016 00:16:41 +0000 (17:16 -0700)
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>
drivers/net/ethernet/freescale/fman/fman.c

index f634e769038e4db640c2986429056ecea1095fa9..1de2e1e51c2be6c2259f8d6dca61b92a1338597e 100644 (file)
@@ -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__);