mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) trivial: chack -> check typo fix in main Makefile trivial: Add a space (and a comma) to a printk in 8250 driver trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx trivial: Fix misspelling of "firmware" in powerpc Makefile trivial: Fix misspelling of "firmware" in usb.c trivial: Fix misspelling of "firmware" in qla1280.c trivial: Fix misspelling of "firmware" in a100u2w.c trivial: Fix misspelling of "firmware" in megaraid.c trivial: Fix misspelling of "firmware" in ql4_mbx.c trivial: Fix misspelling of "firmware" in acpi_memhotplug.c trivial: Fix misspelling of "firmware" in ipw2100.c trivial: Fix misspelling of "firmware" in atmel.c trivial: Fix misspelled firmware in Kconfig trivial: fix an -> a typos in documentation and comments trivial: fix then -> than typos in comments and documentation trivial: update Jesper Juhl CREDITS entry with new email trivial: fix singal -> signal typo trivial: Fix incorrect use of "loose" in event.c trivial: printk: fix indentation of new_text_line declaration trivial: rtc-stk17ta8: fix sparse warning ...
This commit is contained in:
commit
57c44c5f6f
99 changed files with 133 additions and 130 deletions
|
|
@ -535,8 +535,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
|
|||
eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
|
||||
kfree(eerb);
|
||||
MESSAGE(KERN_WARNING, "can't open device since module "
|
||||
"parameter eer_pages is smaller then 1 or"
|
||||
" bigger then %d", (int)(INT_MAX / PAGE_SIZE));
|
||||
"parameter eer_pages is smaller than 1 or"
|
||||
" bigger than %d", (int)(INT_MAX / PAGE_SIZE));
|
||||
unlock_kernel();
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
|
|||
buffer = priv->buffer + sizeof(int);
|
||||
}
|
||||
/*
|
||||
* If the record is bigger then our buffer, we receive only
|
||||
* If the record is bigger than our buffer, we receive only
|
||||
* a part of it. We can get the rest later.
|
||||
*/
|
||||
if (iucv_data_count > NET_BUFFER_SIZE)
|
||||
|
|
@ -437,7 +437,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
|
|||
0, buffer, iucv_data_count,
|
||||
&priv->residual_length);
|
||||
spin_unlock_bh(&priv->priv_lock);
|
||||
/* An rc of 5 indicates that the record was bigger then
|
||||
/* An rc of 5 indicates that the record was bigger than
|
||||
* the buffer, which is OK for us. A 9 indicates that the
|
||||
* record was purged befor we could receive it.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue