diff options
| author | Naveen Kaje <nkaje@codeaurora.org> | 2014-06-13 12:20:45 -0600 |
|---|---|---|
| committer | Naveen Kaje <nkaje@codeaurora.org> | 2014-06-16 13:41:23 -0600 |
| commit | d74b38bb3978a7755d3dd35c55f3517b91cd79be (patch) | |
| tree | 2ebe3b5b7a87ed86d30c009373dcec28388bde0c | |
| parent | c8100225c1b33b91da54b60ea7ad7811d838c07d (diff) | |
msm_serial_hs: Fix wakeup byte data type and log
Wakeup byte should be an unsigned char to match the
definition of tty_insert_flip_string where it is used
and add debug level log for the same.
Change-Id: I6f558d68e7fb99ffaf5c287e703576c2340e5bcb
Signed-off-by: Naveen Kaje <nkaje@codeaurora.org>
| -rw-r--r-- | drivers/tty/serial/msm_serial_hs.c | 11 | ||||
| -rw-r--r-- | include/linux/platform_data/msm_serial_hs.h | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index f04067ea159..1f8c2a67739 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c @@ -210,8 +210,8 @@ struct msm_hs_wakeup { unsigned char ignore; /* bool */ /* bool: inject char into rx tty on wakeup */ - unsigned char inject_rx; - char rx_to_inject; + bool inject_rx; + unsigned char rx_to_inject; }; struct msm_hs_port { @@ -2373,6 +2373,8 @@ static irqreturn_t msm_hs_wakeup_isr(int irq, void *dev) tty_insert_flip_char(tty->port, msm_uport->wakeup.rx_to_inject, TTY_NORMAL); + MSM_HS_DBG("%s(): Inject 0x%x", __func__, + msm_uport->wakeup.rx_to_inject); } } @@ -2749,7 +2751,8 @@ struct msm_serial_hs_platform_data { struct device_node *node = pdev->dev.of_node; struct msm_serial_hs_platform_data *pdata; - int rx_to_inject, ret; + u32 rx_to_inject; + int ret; pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) { @@ -2795,7 +2798,7 @@ struct msm_serial_hs_platform_data MSM_HS_ERR("Error: Rx_char_to_inject not specified.\n"); return ERR_PTR(ret); } - pdata->rx_to_inject = (char)rx_to_inject; + pdata->rx_to_inject = (u8)rx_to_inject; } ret = of_property_read_u32(node, "qcom,bam-tx-ep-pipe-index", diff --git a/include/linux/platform_data/msm_serial_hs.h b/include/linux/platform_data/msm_serial_hs.h index 53160c23dba..cb5d5483e0e 100644 --- a/include/linux/platform_data/msm_serial_hs.h +++ b/include/linux/platform_data/msm_serial_hs.h @@ -37,8 +37,8 @@ */ struct msm_serial_hs_platform_data { int wakeup_irq; /* wakeup irq */ - unsigned char inject_rx_on_wakeup; - char rx_to_inject; + bool inject_rx_on_wakeup; + u8 rx_to_inject; int (*gpio_config)(int); int userid; |