forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.83 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.84 735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch and 736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch have been added upstream. All remaining patches automatically rebased. Signed-off-by: Carsten Schuette <[email protected]>
- Loading branch information
1 parent
d764ca6
commit f210653
Showing
88 changed files
with
337 additions
and
446 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.1 = .82 | ||
LINUX_KERNEL_HASH-6.1.82 = d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 | ||
LINUX_VERSION-6.1 = .84 | ||
LINUX_KERNEL_HASH-6.1.84 = af97d2ebe14765d0db3af6560309daf08535da25bfad36e5fb3e436f22a1707a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,4 +11,4 @@ | |
include distroconfig.txt | ||
|
||
[all] | ||
# Place your custom settings here. | ||
dtoverlay=gpio-fan,gpiopin=17,temp=50000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
} | ||
EXPORT_SYMBOL(drm_panel_init); | ||
|
||
@@ -289,16 +292,18 @@ int of_drm_get_panel_orientation(const s | ||
@@ -294,16 +297,18 @@ int of_drm_get_panel_orientation(const s | ||
if (ret < 0) | ||
return ret; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1185,7 +1185,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
} | ||
--- a/drivers/usb/core/hub.c | ||
+++ b/drivers/usb/core/hub.c | ||
@@ -5677,7 +5677,7 @@ static void port_event(struct usb_hub *h | ||
@@ -5686,7 +5686,7 @@ static void port_event(struct usb_hub *h | ||
port_dev->over_current_count++; | ||
port_over_current_notify(port_dev); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
static inline int mmc_blk_part_switch(struct mmc_card *card, | ||
unsigned int part_type); | ||
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, | ||
@@ -3050,6 +3057,8 @@ static int mmc_blk_probe(struct mmc_card | ||
@@ -3052,6 +3059,8 @@ static int mmc_blk_probe(struct mmc_card | ||
{ | ||
struct mmc_blk_data *md; | ||
int ret = 0; | ||
|
@@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
/* | ||
* Check that the card supports the command class(es) we need. | ||
@@ -3057,7 +3066,16 @@ static int mmc_blk_probe(struct mmc_card | ||
@@ -3059,7 +3068,16 @@ static int mmc_blk_probe(struct mmc_card | ||
if (!(card->csd.cmdclass & CCC_BLOCK_READ)) | ||
return -ENODEV; | ||
|
||
|
@@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
card->complete_wq = alloc_workqueue("mmc_complete", | ||
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); | ||
@@ -3072,6 +3090,17 @@ static int mmc_blk_probe(struct mmc_card | ||
@@ -3074,6 +3092,17 @@ static int mmc_blk_probe(struct mmc_card | ||
goto out_free; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
@@ -1773,7 +1773,7 @@ int vchiq_mmal_component_enable(struct v | ||
@@ -1774,7 +1774,7 @@ int vchiq_mmal_component_enable(struct v | ||
|
||
ret = enable_component(instance, component); | ||
if (ret == 0) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -234,15 +234,15 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
/* deals with receipt of buffer to host message */ | ||
static void buffer_to_host_cb(struct vchiq_mmal_instance *instance, | ||
struct mmal_msg *msg, u32 msg_len) | ||
@@ -1330,6 +1423,7 @@ static int port_disable(struct vchiq_mma | ||
@@ -1331,6 +1424,7 @@ static int port_disable(struct vchiq_mma | ||
mmalbuf->mmal_flags = 0; | ||
mmalbuf->dts = MMAL_TIME_UNKNOWN; | ||
mmalbuf->pts = MMAL_TIME_UNKNOWN; | ||
+ mmalbuf->cmd = 0; | ||
port->buffer_cb(instance, | ||
port, 0, mmalbuf); | ||
} | ||
@@ -1631,6 +1725,43 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||
@@ -1632,6 +1726,43 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||
} | ||
EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup); | ||
|
||
|
@@ -286,39 +286,39 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
/* Initialise a mmal component and its ports | ||
* | ||
*/ | ||
@@ -1680,6 +1811,7 @@ int vchiq_mmal_component_init(struct vch | ||
@@ -1681,6 +1812,7 @@ int vchiq_mmal_component_init(struct vch | ||
ret = port_info_get(instance, &component->control); | ||
if (ret < 0) | ||
goto release_component; | ||
+ init_event_context(instance, &component->control); | ||
|
||
for (idx = 0; idx < component->inputs; idx++) { | ||
component->input[idx].type = MMAL_PORT_TYPE_INPUT; | ||
@@ -1690,6 +1822,7 @@ int vchiq_mmal_component_init(struct vch | ||
@@ -1691,6 +1823,7 @@ int vchiq_mmal_component_init(struct vch | ||
ret = port_info_get(instance, &component->input[idx]); | ||
if (ret < 0) | ||
goto release_component; | ||
+ init_event_context(instance, &component->input[idx]); | ||
} | ||
|
||
for (idx = 0; idx < component->outputs; idx++) { | ||
@@ -1701,6 +1834,7 @@ int vchiq_mmal_component_init(struct vch | ||
@@ -1702,6 +1835,7 @@ int vchiq_mmal_component_init(struct vch | ||
ret = port_info_get(instance, &component->output[idx]); | ||
if (ret < 0) | ||
goto release_component; | ||
+ init_event_context(instance, &component->output[idx]); | ||
} | ||
|
||
for (idx = 0; idx < component->clocks; idx++) { | ||
@@ -1712,6 +1846,7 @@ int vchiq_mmal_component_init(struct vch | ||
@@ -1713,6 +1847,7 @@ int vchiq_mmal_component_init(struct vch | ||
ret = port_info_get(instance, &component->clock[idx]); | ||
if (ret < 0) | ||
goto release_component; | ||
+ init_event_context(instance, &component->clock[idx]); | ||
} | ||
|
||
*component_out = component; | ||
@@ -1737,7 +1872,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | ||
@@ -1738,7 +1873,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | ||
int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, | ||
struct vchiq_mmal_component *component) | ||
{ | ||
|
@@ -327,7 +327,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
if (mutex_lock_interruptible(&instance->vchiq_mutex)) | ||
return -EINTR; | ||
@@ -1749,6 +1884,13 @@ int vchiq_mmal_component_finalise(struct | ||
@@ -1750,6 +1885,13 @@ int vchiq_mmal_component_finalise(struct | ||
|
||
component->in_use = 0; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
@@ -1899,6 +1899,8 @@ int vchiq_mmal_component_finalise(struct | ||
@@ -1900,6 +1900,8 @@ int vchiq_mmal_component_finalise(struct | ||
for (idx = 0; idx < component->clocks; idx++) | ||
free_event_context(&component->clock[idx]); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
@@ -1765,9 +1765,26 @@ static void free_event_context(struct vc | ||
@@ -1766,9 +1766,26 @@ static void free_event_context(struct vc | ||
{ | ||
struct mmal_msg_context *ctx = port->event_context; | ||
|
||
|
@@ -41,15 +41,15 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
} | ||
|
||
/* Initialise a mmal component and its ports | ||
@@ -1865,6 +1882,7 @@ int vchiq_mmal_component_init(struct vch | ||
@@ -1866,6 +1883,7 @@ int vchiq_mmal_component_init(struct vch | ||
|
||
release_component: | ||
destroy_component(instance, component); | ||
+ release_all_event_contexts(component); | ||
unlock: | ||
if (component) | ||
component->in_use = 0; | ||
@@ -1880,7 +1898,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | ||
@@ -1881,7 +1899,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | ||
int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, | ||
struct vchiq_mmal_component *component) | ||
{ | ||
|
@@ -58,7 +58,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
if (mutex_lock_interruptible(&instance->vchiq_mutex)) | ||
return -EINTR; | ||
@@ -1892,14 +1910,7 @@ int vchiq_mmal_component_finalise(struct | ||
@@ -1893,14 +1911,7 @@ int vchiq_mmal_component_finalise(struct | ||
|
||
component->in_use = 0; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci.c | ||
+++ b/drivers/usb/host/xhci.c | ||
@@ -1641,6 +1641,109 @@ command_cleanup: | ||
@@ -1643,6 +1643,109 @@ command_cleanup: | ||
} | ||
|
||
/* | ||
|
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
* non-error returns are a promise to giveback() the urb later | ||
* we drop ownership so next owner (or urb unlink) can get it | ||
*/ | ||
@@ -5469,6 +5572,7 @@ static const struct hc_driver xhci_hc_dr | ||
@@ -5471,6 +5574,7 @@ static const struct hc_driver xhci_hc_dr | ||
.endpoint_reset = xhci_endpoint_reset, | ||
.check_bandwidth = xhci_check_bandwidth, | ||
.reset_bandwidth = xhci_reset_bandwidth, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -91,7 +91,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
} else if (msg->u.buffer_from_host.buffer_header.length == 0) { | ||
/* empty buffer */ | ||
if (msg->u.buffer_from_host.buffer_header.flags & | ||
@@ -1528,6 +1551,9 @@ int vchiq_mmal_port_parameter_set(struct | ||
@@ -1529,6 +1552,9 @@ int vchiq_mmal_port_parameter_set(struct | ||
|
||
mutex_unlock(&instance->vchiq_mutex); | ||
|
||
|
@@ -101,7 +101,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
return ret; | ||
} | ||
EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set); | ||
@@ -1696,6 +1722,31 @@ int vchiq_mmal_submit_buffer(struct vchi | ||
@@ -1697,6 +1723,31 @@ int vchiq_mmal_submit_buffer(struct vchi | ||
unsigned long flags = 0; | ||
int ret; | ||
|
||
|
@@ -133,7 +133,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
ret = buffer_from_host(instance, port, buffer); | ||
if (ret == -EINVAL) { | ||
/* Port is disabled. Queue for when it is enabled. */ | ||
@@ -1729,6 +1780,16 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||
@@ -1730,6 +1781,16 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||
release_msg_context(msg_context); | ||
buf->msg_context = NULL; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,7 +63,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
|
||
--- a/drivers/gpio/Kconfig | ||
+++ b/drivers/gpio/Kconfig | ||
@@ -1243,6 +1243,15 @@ config HTC_EGPIO | ||
@@ -1244,6 +1244,15 @@ config HTC_EGPIO | ||
several HTC phones. It provides basic support for input | ||
pins, output pins, and IRQs. | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -172,7 +172,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle); | ||
|
||
@@ -1086,9 +1101,9 @@ static int create_component(struct vchiq | ||
@@ -1087,9 +1102,9 @@ static int create_component(struct vchiq | ||
component->outputs = rmsg->u.component_create_reply.output_num; | ||
component->clocks = rmsg->u.component_create_reply.clock_num; | ||
|
||
|
@@ -185,7 +185,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
release_msg: | ||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle); | ||
@@ -1257,10 +1272,9 @@ static int port_action_port(struct vchiq | ||
@@ -1258,10 +1273,9 @@ static int port_action_port(struct vchiq | ||
|
||
ret = -rmsg->u.port_action_reply.status; | ||
|
||
|
@@ -199,7 +199,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
release_msg: | ||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle); | ||
@@ -1304,11 +1318,11 @@ static int port_action_handle(struct vch | ||
@@ -1305,11 +1319,11 @@ static int port_action_handle(struct vch | ||
|
||
ret = -rmsg->u.port_action_reply.status; | ||
|
||
|
@@ -216,7 +216,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
release_msg: | ||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle); | ||
@@ -1347,9 +1361,9 @@ static int port_parameter_set(struct vch | ||
@@ -1348,9 +1362,9 @@ static int port_parameter_set(struct vch | ||
|
||
ret = -rmsg->u.port_parameter_set_reply.status; | ||
|
||
|
@@ -229,7 +229,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
release_msg: | ||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle); | ||
@@ -1407,8 +1421,9 @@ static int port_parameter_get(struct vch | ||
@@ -1408,8 +1422,9 @@ static int port_parameter_get(struct vch | ||
/* Always report the size of the returned parameter to the caller */ | ||
*value_size = rmsg->u.port_parameter_get_reply.size; | ||
|
||
|
@@ -241,7 +241,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
release_msg: | ||
vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle); | ||
@@ -1665,7 +1680,7 @@ int vchiq_mmal_port_connect_tunnel(struc | ||
@@ -1666,7 +1681,7 @@ int vchiq_mmal_port_connect_tunnel(struc | ||
if (!dst) { | ||
/* do not make new connection */ | ||
ret = 0; | ||
|
@@ -250,7 +250,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
goto release_unlock; | ||
} | ||
|
||
@@ -1683,14 +1698,14 @@ int vchiq_mmal_port_connect_tunnel(struc | ||
@@ -1684,14 +1699,14 @@ int vchiq_mmal_port_connect_tunnel(struc | ||
/* set new format */ | ||
ret = port_info_set(instance, dst); | ||
if (ret) { | ||
|
@@ -267,7 +267,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
goto release_unlock; | ||
} | ||
|
||
@@ -1699,9 +1714,9 @@ int vchiq_mmal_port_connect_tunnel(struc | ||
@@ -1700,9 +1715,9 @@ int vchiq_mmal_port_connect_tunnel(struc | ||
MMAL_MSG_PORT_ACTION_TYPE_CONNECT, | ||
dst->component->handle, dst->handle); | ||
if (ret < 0) { | ||
|
@@ -280,7 +280,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
goto release_unlock; | ||
} | ||
src->connected = dst; | ||
@@ -1726,7 +1741,8 @@ int vchiq_mmal_submit_buffer(struct vchi | ||
@@ -1727,7 +1742,8 @@ int vchiq_mmal_submit_buffer(struct vchi | ||
* videobuf2 won't let us have the dmabuf there. | ||
*/ | ||
if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) { | ||
|
@@ -290,7 +290,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
ret = vc_sm_cma_import_dmabuf(buffer->dma_buf, | ||
&buffer->vcsm_handle); | ||
if (ret) { | ||
@@ -1742,8 +1758,8 @@ int vchiq_mmal_submit_buffer(struct vchi | ||
@@ -1743,8 +1759,8 @@ int vchiq_mmal_submit_buffer(struct vchi | ||
vc_sm_cma_free(buffer->vcsm_handle); | ||
return ret; | ||
} | ||
|
@@ -301,7 +301,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
} | ||
|
||
ret = buffer_from_host(instance, port, buffer); | ||
@@ -1782,8 +1798,8 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||
@@ -1783,8 +1799,8 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||
if (buf->vcsm_handle) { | ||
int ret; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <[email protected]> | |
|
||
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||
@@ -1500,6 +1500,8 @@ static int port_enable(struct vchiq_mmal | ||
@@ -1501,6 +1501,8 @@ static int port_enable(struct vchiq_mmal | ||
|
||
port->enabled = 1; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/mmc/core/block.c | ||
+++ b/drivers/mmc/core/block.c | ||
@@ -1970,7 +1970,7 @@ static void mmc_blk_mq_rw_recovery(struc | ||
@@ -1972,7 +1972,7 @@ static void mmc_blk_mq_rw_recovery(struc | ||
return; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci.c | ||
+++ b/drivers/usb/host/xhci.c | ||
@@ -1730,7 +1730,7 @@ static void xhci_fixup_endpoint(struct u | ||
@@ -1732,7 +1732,7 @@ static void xhci_fixup_endpoint(struct u | ||
return; | ||
} | ||
ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,7 +71,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
* hardware interrupt, we use a timer-based system. The original | ||
--- a/drivers/tty/serial/8250/8250_port.c | ||
+++ b/drivers/tty/serial/8250/8250_port.c | ||
@@ -1559,6 +1559,9 @@ static void serial8250_stop_tx(struct ua | ||
@@ -1553,6 +1553,9 @@ static void serial8250_stop_tx(struct ua | ||
serial_icr_write(up, UART_ACR, up->acr); | ||
} | ||
serial8250_rpm_put(up); | ||
|
@@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
} | ||
|
||
static inline void __start_tx(struct uart_port *port) | ||
@@ -1669,6 +1672,9 @@ static void serial8250_start_tx(struct u | ||
@@ -1663,6 +1666,9 @@ static void serial8250_start_tx(struct u | ||
struct uart_8250_port *up = up_to_u8250p(port); | ||
struct uart_8250_em485 *em485 = up->em485; | ||
|
||
|
@@ -91,7 +91,7 @@ Signed-off-by: Phil Elwell <[email protected]> | |
if (!port->x_char && uart_circ_empty(&port->state->xmit)) | ||
return; | ||
|
||
@@ -1889,6 +1895,9 @@ unsigned int serial8250_modem_status(str | ||
@@ -1883,6 +1889,9 @@ unsigned int serial8250_modem_status(str | ||
uart_handle_cts_change(port, status & UART_MSR_CTS); | ||
|
||
wake_up_interruptible(&port->state->port.delta_msr_wait); | ||
|
Oops, something went wrong.