---

yaml --- r: 203695 b: refs/heads/master c: 50a749c h: refs/heads/master i: 203693: f8a2486 203691: 42e5fd7 203687: 00ffb41 203679: 49853ab v: v3
git-mirror · Jul 23, 2010 · 15e4166 · 15e4166
1 parent d9f811b
commit 15e4166
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f89f5d0e94e001e0a09bd433c0c0f089eaf0dea9
+refs/heads/master: 50a749c1f2fc8f03232c174c9dbc78a78f9bebfd
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
@@ -2675,7 +2675,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 	 * Detect hardware parameters.
 	 */
 	msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
-	msp->tx_csum_limit = pd->tx_csum_limit ? pd->tx_csum_limit : 9 * 1024;
+	msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
+					pd->tx_csum_limit : 9 * 1024;
 	infer_hw_params(msp);
 
 	platform_set_drvdata(pdev, msp);