projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'rpi-next-2020.07.2' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[oweals/u-boot.git]
/
drivers
/
usb
/
eth
/
r8152.c
diff --git
a/drivers/usb/eth/r8152.c
b/drivers/usb/eth/r8152.c
index 61b8683230df17f570c33ba4bea4cf5557750d9d..f201a1789b6600a326834a72c1c1d12515c5fa51 100644
(file)
--- a/
drivers/usb/eth/r8152.c
+++ b/
drivers/usb/eth/r8152.c
@@
-711,9
+711,9
@@
static void r8152b_enter_oob(struct r8152 *tp)
rtl_rx_vlan_en(tp, false);
rtl_rx_vlan_en(tp, false);
- ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, P
AL
_BDC_CR);
+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, P
LA
_BDC_CR);
ocp_data |= ALDPS_PROXY_MODE;
ocp_data |= ALDPS_PROXY_MODE;
- ocp_write_word(tp, MCU_TYPE_PLA, P
AL
_BDC_CR, ocp_data);
+ ocp_write_word(tp, MCU_TYPE_PLA, P
LA
_BDC_CR, ocp_data);
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
@@
-844,9
+844,9
@@
static void r8153_enter_oob(struct r8152 *tp)
rtl_rx_vlan_en(tp, false);
rtl_rx_vlan_en(tp, false);
- ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, P
AL
_BDC_CR);
+ ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, P
LA
_BDC_CR);
ocp_data |= ALDPS_PROXY_MODE;
ocp_data |= ALDPS_PROXY_MODE;
- ocp_write_word(tp, MCU_TYPE_PLA, P
AL
_BDC_CR, ocp_data);
+ ocp_write_word(tp, MCU_TYPE_PLA, P
LA
_BDC_CR, ocp_data);
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB;
@@
-1354,9
+1354,8
@@
int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
struct usb_interface *iface;
struct usb_interface_descriptor *iface_desc;
int ep_in_found = 0, ep_out_found = 0;
struct usb_interface *iface;
struct usb_interface_descriptor *iface_desc;
int ep_in_found = 0, ep_out_found = 0;
- int i;
-
struct r8152 *tp;
struct r8152 *tp;
+ int i;
/* let's examine the device now */
iface = &dev->config.if_desc[ifnum];
/* let's examine the device now */
iface = &dev->config.if_desc[ifnum];
@@
-1399,10
+1398,13
@@
int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
if ((iface->ep_desc[i].bmAttributes &
USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
u8 ep_addr = iface->ep_desc[i].bEndpointAddress;
if ((iface->ep_desc[i].bmAttributes &
USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
u8 ep_addr = iface->ep_desc[i].bEndpointAddress;
- if ((ep_addr & USB_DIR_IN) && !ep_in_found) {
- ss->ep_in = ep_addr &
- USB_ENDPOINT_NUMBER_MASK;
- ep_in_found = 1;
+
+ if (ep_addr & USB_DIR_IN) {
+ if (!ep_in_found) {
+ ss->ep_in = ep_addr &
+ USB_ENDPOINT_NUMBER_MASK;
+ ep_in_found = 1;
+ }
} else {
if (!ep_out_found) {
ss->ep_out = ep_addr &
} else {
if (!ep_out_found) {
ss->ep_out = ep_addr &