--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -9542,9 +9542,8 @@ static int rtl_fw_init(struct r8152 *tp)
+@@ -9556,9 +9556,8 @@ static int rtl_fw_init(struct r8152 *tp)
return 0;
}
u32 ocp_data = 0;
__le32 *tmp;
u8 version;
-@@ -9614,10 +9613,19 @@ u8 rtl8152_get_version(struct usb_interf
+@@ -9628,10 +9627,19 @@ u8 rtl8152_get_version(struct usb_interf
break;
default:
version = RTL_VER_UNKNOWN;
dev_dbg(&intf->dev, "Detected version 0x%04x\n", version);
return version;
-@@ -9917,6 +9925,12 @@ static int rtl8152_cfgselector_probe(str
+@@ -9931,6 +9939,12 @@ static int rtl8152_cfgselector_probe(str
struct usb_host_config *c;
int i, num_configs;