diff options
| author | Jan Weitzel <j.weitzel@phytec.de> | 2012-09-10 13:33:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-10 18:06:21 +0200 |
| commit | a685c02ebfd1b345c2059f36336e8c5d89cf2a8c (patch) | |
| tree | 67a5739dcafa0fbbf1f60ec6430b74d317bf7601 | |
| parent | 790ca84f39b47c89a215c024dded84db5e97541e (diff) | |
| download | barebox-a685c02ebfd1b345c2059f36336e8c5d89cf2a8c.tar.gz barebox-a685c02ebfd1b345c2059f36336e8c5d89cf2a8c.tar.xz | |
smsc911x: Check platformdata pointer
If pdata is NULL smc911x_probe will crash. Checking the zero initialized
priv->shift results in default configuration if pdata is not set.
Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/net/smc911x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index bc1e001d8c..f69760853d 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -435,7 +435,7 @@ static int smc911x_probe(struct device_d *dev) priv->shift = pdata->shift; if (is_32bit) { - if (pdata->shift) { + if (priv->shift) { priv->reg_read = __smc911x_reg_readl_shift; priv->reg_write = __smc911x_reg_writel_shift; } else { @@ -443,7 +443,7 @@ static int smc911x_probe(struct device_d *dev) priv->reg_write = __smc911x_reg_writel; } } else { - if (pdata->shift) { + if (priv->shift) { priv->reg_read = __smc911x_reg_readw_shift; priv->reg_write = __smc911x_reg_writew_shift; } else { |