Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++---
+ drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
-index a8bb061e1a8a..36c7d78ba780 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
-@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev)
+@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct
"driver lock acquired\n");
return 1;
}
} while (++i < 10);
netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n");
-@@ -3291,7 +3291,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
+@@ -3291,7 +3291,7 @@ static int ql_adapter_reset(struct ql3_a
if ((value & ISP_CONTROL_SR) == 0)
break;
} while ((--max_wait_time));
/*
-@@ -3327,7 +3327,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
+@@ -3327,7 +3327,7 @@ static int ql_adapter_reset(struct ql3_a
ispControlStatus);
if ((value & ISP_CONTROL_FSR) == 0)
break;
} while ((--max_wait_time));
}
if (max_wait_time == 0)
---
-2.30.2
-
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/usb/dwc3/gadget.c | 18 ++++++++++++++++--
+ drivers/usb/dwc3/gadget.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
-diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index c93bed41d988..e6e3095303b1 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
-@@ -1466,11 +1466,18 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep)
+@@ -1466,11 +1466,18 @@ static void dwc3_gadget_ep_cleanup_cance
{
struct dwc3_request *req;
struct dwc3_request *tmp;
}
static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
-@@ -2443,8 +2450,12 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep,
+@@ -2443,8 +2450,12 @@ static void dwc3_gadget_ep_cleanup_compl
{
struct dwc3_request *req;
struct dwc3_request *tmp;
int ret;
ret = dwc3_gadget_ep_cleanup_completed_request(dep, event,
-@@ -2452,6 +2463,9 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep,
+@@ -2452,6 +2463,9 @@ static void dwc3_gadget_ep_cleanup_compl
if (ret)
break;
}
}
static bool dwc3_gadget_ep_should_continue(struct dwc3_ep *dep)
---
-2.30.2
-
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++---
+ drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
-index 192950a112c9..cb9d43c871c4 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
-@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev)
+@@ -155,7 +155,7 @@ static int ql_wait_for_drvr_lock(struct
"driver lock acquired\n");
return 1;
}
} while (++i < 10);
netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n");
-@@ -3287,7 +3287,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
+@@ -3287,7 +3287,7 @@ static int ql_adapter_reset(struct ql3_a
if ((value & ISP_CONTROL_SR) == 0)
break;
} while ((--max_wait_time));
/*
-@@ -3323,7 +3323,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev)
+@@ -3323,7 +3323,7 @@ static int ql_adapter_reset(struct ql3_a
ispControlStatus);
if ((value & ISP_CONTROL_FSR) == 0)
break;
} while ((--max_wait_time));
}
if (max_wait_time == 0)
---
-2.30.2
-
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++---
+ drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
-diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c
-index ed10da5313e8..a5bf4c3f6dc7 100644
--- a/drivers/firmware/broadcom/tee_bnxt_fw.c
+++ b/drivers/firmware/broadcom/tee_bnxt_fw.c
-@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct device *dev)
+@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct devi
pvt_data.dev = dev;
err = PTR_ERR(fw_shm_pool);
goto out_sess;
}
-@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct device *dev)
+@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct dev
return 0;
}
static const struct tee_client_device_id tee_bnxt_fw_id_table[] = {
{UUID_INIT(0x6272636D, 0x2019, 0x0716,
0x42, 0x43, 0x4D, 0x5F, 0x53, 0x43, 0x48, 0x49)},
-@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt_fw_driver = {
+@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt
.bus = &tee_bus_type,
.probe = tee_bnxt_fw_probe,
.remove = tee_bnxt_fw_remove,
},
};
---
-2.30.2
-
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++---
+ drivers/firmware/broadcom/tee_bnxt_fw.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
-diff --git a/drivers/firmware/broadcom/tee_bnxt_fw.c b/drivers/firmware/broadcom/tee_bnxt_fw.c
-index ed10da5313e8..a5bf4c3f6dc7 100644
--- a/drivers/firmware/broadcom/tee_bnxt_fw.c
+++ b/drivers/firmware/broadcom/tee_bnxt_fw.c
-@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct device *dev)
+@@ -212,10 +212,9 @@ static int tee_bnxt_fw_probe(struct devi
pvt_data.dev = dev;
err = PTR_ERR(fw_shm_pool);
goto out_sess;
}
-@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct device *dev)
+@@ -242,6 +241,14 @@ static int tee_bnxt_fw_remove(struct dev
return 0;
}
static const struct tee_client_device_id tee_bnxt_fw_id_table[] = {
{UUID_INIT(0x6272636D, 0x2019, 0x0716,
0x42, 0x43, 0x4D, 0x5F, 0x53, 0x43, 0x48, 0x49)},
-@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt_fw_driver = {
+@@ -257,6 +264,7 @@ static struct tee_client_driver tee_bnxt
.bus = &tee_bus_type,
.probe = tee_bnxt_fw_probe,
.remove = tee_bnxt_fw_remove,
},
};
---
-2.30.2
-