xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master'

Browse Source 
Manually fixed up:

	drivers/net/fs_enet/fs_enet-main.c
This commit is contained in:
Benjamin Herrenschmidt
2008-07-22 17:12:37 +10:00
parent c69cccc95f 93ded9b8fd
commit 8725f25acc
2632 changed files with 206418 additions and 126297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/fs_enet/fs_enet-main.c
View File

@@ -37,6 +37,7 @@
#include <linux/platform_device.h>
#include <linux/phy.h>
#include <linux/of_platform.h>
#include <linux/of_gpio.h>
#include <linux/vmalloc.h>
#include <asm/pgtable.h>
@@ -729,7 +730,7 @@ static void generic_adjust_link(struct net_device *dev)
if (!fep->oldlink) {
new_state = 1;
fep->oldlink = 1;
netif_schedule(dev);
netif_tx_schedule_all(dev);
netif_carrier_on(dev);
netif_start_queue(dev);
}
@@ -979,8 +980,7 @@ static int __devinit find_phy(struct device_node *np,
struct fs_platform_info *fpi)
{
struct device_node *phynode, *mdionode;
struct resource res;
int ret = 0, len;
int ret = 0, len, bus_id;
const u32 *data;
data = of_get_property(np, "fixed-link", NULL);
@@ -997,19 +997,28 @@ static int __devinit find_phy(struct device_node *np,
if (!phynode)
return -EINVAL;
mdionode = of_get_parent(phynode);
if (!mdionode)
goto out_put_phy;
ret = of_address_to_resource(mdionode, 0, &res);
if (ret)
goto out_put_mdio;
data = of_get_property(phynode, "reg", &len);
if (!data || len != 4)
goto out_put_mdio;
if (!data || len != 4) {
ret = -EINVAL;
goto out_put_phy;
}
snprintf(fpi->bus_id, 16, "%x:%02x", res.start, *data);
mdionode = of_get_parent(phynode);
if (!mdionode) {
ret = -EINVAL;
goto out_put_phy;
}
bus_id = of_get_gpio(mdionode, 0);
if (bus_id < 0) {
struct resource res;
ret = of_address_to_resource(mdionode, 0, &res);
if (ret)
goto out_put_mdio;
bus_id = res.start;
}
snprintf(fpi->bus_id, 16, "%x:%02x", bus_id, *data);
out_put_mdio:
of_node_put(mdionode);