diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-09 15:09:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-09 15:09:26 -0400 |
| commit | 2a70ea5cda00214a1d573acf19fa0cd06d947e38 (patch) | |
| tree | 17b53255c485f4284dcdd8ca7db4f4667420c6e8 | |
| parent | 6419945e3313fd894af79caefca6823d4511133f (diff) | |
| parent | 70d52ba9e57eb93cfe916f7f4d14a09750890ffd (diff) | |
Merge tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI update from Sebastian Reichel:
"Just one patch for the HSI subsystem this time: use the new vm_fault_t
return type"
* tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
hsi: clients: Change return type to vm_fault_t
| -rw-r--r-- | drivers/hsi/clients/cmt_speech.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c index 324cb8ec9405..a1d4b9366496 100644 --- a/drivers/hsi/clients/cmt_speech.c +++ b/drivers/hsi/clients/cmt_speech.c | |||
| @@ -1098,7 +1098,7 @@ static void cs_hsi_stop(struct cs_hsi_iface *hi) | |||
| 1098 | kfree(hi); | 1098 | kfree(hi); |
| 1099 | } | 1099 | } |
| 1100 | 1100 | ||
| 1101 | static int cs_char_vma_fault(struct vm_fault *vmf) | 1101 | static vm_fault_t cs_char_vma_fault(struct vm_fault *vmf) |
| 1102 | { | 1102 | { |
| 1103 | struct cs_char *csdata = vmf->vma->vm_private_data; | 1103 | struct cs_char *csdata = vmf->vma->vm_private_data; |
| 1104 | struct page *page; | 1104 | struct page *page; |