diff options
author | David S. Miller | 2012-02-04 22:39:32 +0100 |
---|---|---|
committer | David S. Miller | 2012-02-04 22:39:32 +0100 |
commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /drivers/net/ethernet/ti/davinci_mdio.c | |
parent | mlx4: Fix typo in cmd.c (diff) | |
parent | netprio_cgroup: Fix obo in get_prioidx (diff) | |
download | kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.gz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.xz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/ti/davinci_mdio.c')
-rw-r--r-- | drivers/net/ethernet/ti/davinci_mdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index ef7c9c17bfff..af8b8fc39eb2 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c @@ -318,9 +318,9 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev) data->clk = clk_get(dev, NULL); if (IS_ERR(data->clk)) { - data->clk = NULL; dev_err(dev, "failed to get device clock\n"); ret = PTR_ERR(data->clk); + data->clk = NULL; goto bail_out; } |