diff options
| author | Oleksij Rempel <o.rempel@pengutronix.de> | 2018-06-15 08:09:43 +0200 |
|---|---|---|
| committer | Oleksij Rempel <o.rempel@pengutronix.de> | 2018-06-15 08:09:43 +0200 |
| commit | c43e9b08f18bb92c5c84a78679faf64818a3c5e0 (patch) | |
| tree | 17c6db4b5ff52f16c0c1e00fa359e4ad1f422c42 | |
| parent | de3f8061dd3ff5e2ef7a37826657c5fc6400b34b (diff) | |
| download | linux-c43e9b08f18bb92c5c84a78679faf64818a3c5e0.tar.gz linux-c43e9b08f18bb92c5c84a78679faf64818a3c5e0.tar.xz | |
m drivers/mailbox/imx-mailbox.cv4.17/topic/imx7d-m4-2018.06.14
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
| -rw-r--r-- | drivers/mailbox/imx-mailbox.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 2bc9f11393b1..e3f621cb1d30 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -85,8 +85,8 @@ static u32 imx_mu_rmw(struct imx_mu_priv *priv, u32 offs, u32 set, u32 clr) static irqreturn_t imx_mu_isr(int irq, void *p) { struct mbox_chan *chan = p; - struct imx_mu_con_priv *cp = chan->con_priv; struct imx_mu_priv *priv = to_imx_mu_priv(chan->mbox); + struct imx_mu_con_priv *cp = chan->con_priv; u32 val, dat; @@ -116,7 +116,7 @@ static bool imx_mu_last_tx_done(struct mbox_chan *chan) val = imx_mu_read(priv, IMX_MU_xSR); /* test if transmit register is empty */ - return (!(val & IMX_MU_xSR_TEn(cp->bidx))); + return (!!(val & IMX_MU_xSR_TEn(cp->bidx))); } static int imx_mu_send_data(struct mbox_chan *chan, void *data) @@ -125,7 +125,7 @@ static int imx_mu_send_data(struct mbox_chan *chan, void *data) struct imx_mu_con_priv *cp = chan->con_priv; u32 *arg = data; - if (imx_mu_last_tx_done(chan)) + if (!imx_mu_last_tx_done(chan)) return -EBUSY; imx_mu_write(priv, *arg, IMX_MU_xTRn(cp->idx)); @@ -168,7 +168,6 @@ static const struct mbox_chan_ops imx_mu_ops = { .send_data = imx_mu_send_data, .startup = imx_mu_startup, .shutdown = imx_mu_shutdown, - .last_tx_done = imx_mu_last_tx_done, }; static int imx_mu_probe(struct platform_device *pdev) @@ -285,5 +284,5 @@ static struct platform_driver imx_mu_driver = { module_platform_driver(imx_mu_driver); MODULE_AUTHOR("Oleksij Rempel <o.rempel@pengutronix.de>"); -MODULE_DESCRIPTION("Message Unit driver for i.MX7"); +MODULE_DESCRIPTION("Message Unit driver for i.MX"); MODULE_LICENSE("GPL v2"); |