diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 11:22:21 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-02 11:22:21 -0400 |
commit | 5e9b41ff0968e94bdae030296cce94f418b74ed3 (patch) | |
tree | d4cc64eadaa3f5cc8f09811fe92027682ed02028 | |
parent | 3330becb479fd26cfeeea1e06f8999c3b10806cc (diff) | |
parent | 595f3a9de5815d38198136491fa50a8ee1700b7d (diff) |
Merge tag 'keystone_soc_drivers_4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
Pull "Keystone SOC for 4.15" from Santosh Shilimkar
* tag 'keystone_soc_drivers_4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ti_sci: Use %pS printk format for direct addresses
-rw-r--r-- | drivers/firmware/ti_sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 00cfed3c3e1a..23b12d99ddfe 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c | |||
@@ -439,7 +439,7 @@ static inline int ti_sci_do_xfer(struct ti_sci_info *info, | |||
439 | /* And we wait for the response. */ | 439 | /* And we wait for the response. */ |
440 | timeout = msecs_to_jiffies(info->desc->max_rx_timeout_ms); | 440 | timeout = msecs_to_jiffies(info->desc->max_rx_timeout_ms); |
441 | if (!wait_for_completion_timeout(&xfer->done, timeout)) { | 441 | if (!wait_for_completion_timeout(&xfer->done, timeout)) { |
442 | dev_err(dev, "Mbox timedout in resp(caller: %pF)\n", | 442 | dev_err(dev, "Mbox timedout in resp(caller: %pS)\n", |
443 | (void *)_RET_IP_); | 443 | (void *)_RET_IP_); |
444 | ret = -ETIMEDOUT; | 444 | ret = -ETIMEDOUT; |
445 | } | 445 | } |