diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:47:51 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-23 14:48:05 +0100 |
| commit | 41921c54b898292b0140d5f322cc8ec5b0642a7e (patch) | |
| tree | 70c62f3b26536abf0fa4b347300c78360d4ff546 /drivers/event/octeontx/ssovf_mbox.c | |
| parent | 76f89ef557ff345dfa606e797e1765404babce56 (diff) | |
| parent | f239aed5e674965691846e8ce3f187dd47523689 (diff) | |
Merge branch 'upstream' into HEAD
Change-Id: Ib9772cbbc33c14a44bd918056b22602ff6891a18
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/event/octeontx/ssovf_mbox.c')
| -rw-r--r-- | drivers/event/octeontx/ssovf_mbox.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/event/octeontx/ssovf_mbox.c b/drivers/event/octeontx/ssovf_mbox.c index 7394a3a9..764414b5 100644 --- a/drivers/event/octeontx/ssovf_mbox.c +++ b/drivers/event/octeontx/ssovf_mbox.c @@ -1,7 +1,7 @@ /* * BSD LICENSE * - * Copyright (C) Cavium networks Ltd. 2017. + * Copyright (C) Cavium, Inc. 2017. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * * Neither the name of Cavium networks nor the names of its + * * Neither the name of Cavium, Inc nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -172,7 +172,7 @@ mbox_wait_response(struct mbox *m, struct octeontx_mbox_hdr *hdr, error: ssovf_log_err("Failed to send mbox(%d/%d) coproc=%d msg=%d ret=(%d,%d)", - m->tag_own, rx_hdr.tag, hdr->msg, hdr->coproc, res, + m->tag_own, rx_hdr.tag, hdr->coproc, hdr->msg, res, hdr->res_code); return res; } |