From 15e41667d256a8fc3bad708656e07d5503e8a6d7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 23 Jul 2010 01:05:05 +0000 Subject: [PATCH] --- yaml --- r: 203695 b: refs/heads/master c: 50a749c1f2fc8f03232c174c9dbc78a78f9bebfd h: refs/heads/master i: 203693: f8a2486c9c3da64dc07986480ff2ef901eb7ea37 203691: 42e5fd7bba521b83d0178e121ae6b99093f2b52b 203687: 00ffb41bbf6ac0f8697cdfc17d47ca8e0465fd79 203679: 49853ab526307efb555bdafe08ebb968010c7e7b v: v3 --- [refs] | 2 +- trunk/drivers/net/mv643xx_eth.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00daa2269e86..cfd6b3c31a13 100644 --- 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 index 2fcdb1e1b99d..2d488abcf62d 100644 --- 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);