remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches

[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366_smi.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index f9a332d..28e1a85 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -448,7 +448,7 @@ static int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port,
        return -ENOSPC;
 }
 
        return -ENOSPC;
 }
 

-static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)

 {
        int err;
 
 {
        int err;
 


@@ -465,6 +465,7 @@ static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
 
        return err;
 }
 
        return err;
 }

+EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);

 
 static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 {
 
 static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 {


@@ -1201,12 +1202,12 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
        if (err) {
                dev_err(smi->parent, "VLAN initialization failed, err=%d\n",
                        err);
        if (err) {
                dev_err(smi->parent, "VLAN initialization failed, err=%d\n",
                        err);

-               goto err_disable_hw;
+               goto err_free_sck;

        }
 
        err = rtl8366_enable_all_ports(smi, 1);
        if (err)
        }
 
        err = rtl8366_enable_all_ports(smi, 1);
        if (err)

-               goto err_disable_hw;
+               goto err_free_sck;

 
        err = rtl8366_smi_mii_init(smi);
        if (err)
 
        err = rtl8366_smi_mii_init(smi);
        if (err)