git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
ti
/
cpsw.c
diff --git
a/drivers/net/ethernet/ti/cpsw.c
b/drivers/net/ethernet/ti/cpsw.c
index
a45f64e
..
101b037
100644
(file)
--- a/
drivers/net/ethernet/ti/cpsw.c
+++ b/
drivers/net/ethernet/ti/cpsw.c
@@
-1681,7
+1681,7
@@
static int cpsw_probe(struct platform_device *pdev)
priv->rx_packet_max = max(rx_packet_max, 128);
priv->cpts = devm_kzalloc(&pdev->dev, sizeof(struct cpts), GFP_KERNEL);
priv->irq_enabled = true;
- if (!
ndev
) {
+ if (!
priv->cpts
) {
pr_err("error allocating cpts\n");
goto clean_ndev_ret;
}