diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 13:35:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 13:35:43 -0800 |
| commit | 6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f (patch) | |
| tree | e6e7f723ea7ea51ccf79ad21a2715da00b4948c9 /drivers/hsi/clients | |
| parent | Merge tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux (diff) | |
| parent | dt-bindings: hsi: add omap4 hsi controller bindings (diff) | |
| download | linux-dev-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.tar.xz linux-dev-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.zip | |
Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
- add HSI OMAP4 bindings
- misc small fixes
* tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
dt-bindings: hsi: add omap4 hsi controller bindings
HSI: hsi_char: pr_err() strings should end with newlines
HSI: omap_ssi_core: fix kilo to be "k" not "K"
Diffstat (limited to 'drivers/hsi/clients')
| -rw-r--r-- | drivers/hsi/clients/hsi_char.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c index 57f70c28fa38..cf9c2a332ad8 100644 --- a/drivers/hsi/clients/hsi_char.c +++ b/drivers/hsi/clients/hsi_char.c @@ -773,13 +773,13 @@ static int __init hsc_init(void) if ((max_data_size < 4) || (max_data_size > 0x10000) || (max_data_size & (max_data_size - 1))) { - pr_err("Invalid max read/write data size"); + pr_err("Invalid max read/write data size\n"); return -EINVAL; } ret = hsi_register_client_driver(&hsc_driver); if (ret) { - pr_err("Error while registering HSI/SSI driver %d", ret); + pr_err("Error while registering HSI/SSI driver %d\n", ret); return ret; } |