summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@nxp.com>2016-07-12 17:08:52 +0200
committerMadalin Bucur <madalin.bucur@nxp.com>2016-10-04 08:26:10 +0200
commit0af46590d415ee672f9056c7cda5da63e02dbebf (patch)
tree2cf6051c0195aa9de9eccd5ce9ba9431f493cada
parentfsl/fman: simplify redundant condition (diff)
downloadlinux-0af46590d415ee672f9056c7cda5da63e02dbebf.tar.xz
linux-0af46590d415ee672f9056c7cda5da63e02dbebf.zip
fsl/fman: fix return value checking
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
-rw-r--r--drivers/net/ethernet/freescale/fman/fman.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index 1fc10493a6b1..dafd9e1baba2 100644
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -618,7 +618,7 @@ struct fman {
unsigned long cam_offset;
size_t cam_size;
/* Fifo in MURAM */
- int fifo_offset;
+ unsigned long fifo_offset;
size_t fifo_size;
u32 liodn_base[64];
@@ -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->cam_offset)) {
+ if (IS_ERR_VALUE(fman->fifo_offset)) {
free_init_resources(fman);
dev_err(fman->dev, "%s: MURAM alloc for BMI FIFO failed\n",
__func__);