diff options
| -rw-r--r-- | drivers/usb/pd/policy_engine.c | 6 | ||||
| -rw-r--r-- | drivers/usb/pd/qpnp-pdphy.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/pd/policy_engine.c b/drivers/usb/pd/policy_engine.c index 5fae365b9c71..77a1627ac5f2 100644 --- a/drivers/usb/pd/policy_engine.c +++ b/drivers/usb/pd/policy_engine.c @@ -817,7 +817,7 @@ static struct rx_msg *pd_ext_msg_received(struct usbpd *pd, u16 header, u8 *buf, /* allocate new message if first chunk */ rx_msg = kzalloc(sizeof(*rx_msg) + PD_MSG_EXT_HDR_DATA_SIZE(ext_hdr), - GFP_KERNEL); + GFP_ATOMIC); if (!rx_msg) return NULL; @@ -870,7 +870,7 @@ static struct rx_msg *pd_ext_msg_received(struct usbpd *pd, u16 header, u8 *buf, pd->rx_ext_msg = rx_msg; - req = kzalloc(sizeof(*req), GFP_KERNEL); + req = kzalloc(sizeof(*req), GFP_ATOMIC); if (!req) goto queue_rx; /* return what we have anyway */ @@ -944,7 +944,7 @@ static void phy_msg_received(struct usbpd *pd, enum pd_sop_type sop, PD_MSG_HDR_TYPE(header), PD_MSG_HDR_COUNT(header)); if (!PD_MSG_HDR_IS_EXTENDED(header)) { - rx_msg = kzalloc(sizeof(*rx_msg) + len, GFP_KERNEL); + rx_msg = kzalloc(sizeof(*rx_msg) + len, GFP_ATOMIC); if (!rx_msg) return; diff --git a/drivers/usb/pd/qpnp-pdphy.c b/drivers/usb/pd/qpnp-pdphy.c index b2a12464ca54..c3e9f2394b24 100644 --- a/drivers/usb/pd/qpnp-pdphy.c +++ b/drivers/usb/pd/qpnp-pdphy.c @@ -667,7 +667,7 @@ static int pd_phy_bist_mode(u8 bist_mode) BIST_MODE_MASK | BIST_ENABLE, bist_mode | BIST_ENABLE); } -static irqreturn_t pdphy_msg_rx_irq_thread(int irq, void *data) +static irqreturn_t pdphy_msg_rx_irq(int irq, void *data) { u8 size, rx_status, frame_type; u8 buf[32]; @@ -808,8 +808,8 @@ static int pdphy_probe(struct platform_device *pdev) return ret; ret = pdphy_request_irq(pdphy, pdev->dev.of_node, - &pdphy->msg_rx_irq, "msg-rx", NULL, - pdphy_msg_rx_irq_thread, (IRQF_TRIGGER_RISING | IRQF_ONESHOT)); + &pdphy->msg_rx_irq, "msg-rx", pdphy_msg_rx_irq, + NULL, (IRQF_TRIGGER_RISING | IRQF_ONESHOT)); if (ret < 0) return ret; |