소스 검색

fsl/fman: Initialize fman->dev earlier

Currently, in a case of error, dev_err is using fman->dev
before its initialization and "(NULL device *)" is printed.
This patch fixes this issue.

Signed-off-by: Igal Liberman <igal.liberman@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Igal Liberman 9 년 전
부모
커밋
878e3c1be2
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      drivers/net/ethernet/freescale/fman/fman.c

+ 2 - 2
drivers/net/ethernet/freescale/fman/fman.c

@@ -2791,6 +2791,8 @@ static struct fman *read_dts_node(struct platform_device *of_dev)
 		goto fman_free;
 		goto fman_free;
 	}
 	}
 
 
+	fman->dev = &of_dev->dev;
+
 	return fman;
 	return fman;
 
 
 fman_node_put:
 fman_node_put:
@@ -2845,8 +2847,6 @@ static int fman_probe(struct platform_device *of_dev)
 
 
 	dev_set_drvdata(dev, fman);
 	dev_set_drvdata(dev, fman);
 
 
-	fman->dev = dev;
-
 	dev_dbg(dev, "FMan%d probed\n", fman->dts_params.id);
 	dev_dbg(dev, "FMan%d probed\n", fman->dts_params.id);
 
 
 	return 0;
 	return 0;