aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 14:31:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 14:31:52 -0500
commit57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch)
tree978bd46ca765a88e9c101cb705bbb0bf46015643 /drivers/s390
parent76052749143d03006271cc0ce8205ad756917062 (diff)
parent5a9e67b1a19e08a82387709f325d26e07b891d27 (diff)
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 ...
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/dasd_eer.c4
-rw-r--r--drivers/s390/char/vmlogrdr.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 892e2878d61b..f8e05ce98621 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -535,8 +535,8 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
535 eerb->buffer_page_count > INT_MAX / PAGE_SIZE) { 535 eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
536 kfree(eerb); 536 kfree(eerb);
537 MESSAGE(KERN_WARNING, "can't open device since module " 537 MESSAGE(KERN_WARNING, "can't open device since module "
538 "parameter eer_pages is smaller then 1 or" 538 "parameter eer_pages is smaller than 1 or"
539 " bigger then %d", (int)(INT_MAX / PAGE_SIZE)); 539 " bigger than %d", (int)(INT_MAX / PAGE_SIZE));
540 unlock_kernel(); 540 unlock_kernel();
541 return -EINVAL; 541 return -EINVAL;
542 } 542 }
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index aabbeb909cc6..d8a2289fcb69 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -427,7 +427,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
427 buffer = priv->buffer + sizeof(int); 427 buffer = priv->buffer + sizeof(int);
428 } 428 }
429 /* 429 /*
430 * If the record is bigger then our buffer, we receive only 430 * If the record is bigger than our buffer, we receive only
431 * a part of it. We can get the rest later. 431 * a part of it. We can get the rest later.
432 */ 432 */
433 if (iucv_data_count > NET_BUFFER_SIZE) 433 if (iucv_data_count > NET_BUFFER_SIZE)
@@ -437,7 +437,7 @@ static int vmlogrdr_receive_data(struct vmlogrdr_priv_t *priv)
437 0, buffer, iucv_data_count, 437 0, buffer, iucv_data_count,
438 &priv->residual_length); 438 &priv->residual_length);
439 spin_unlock_bh(&priv->priv_lock); 439 spin_unlock_bh(&priv->priv_lock);
440 /* An rc of 5 indicates that the record was bigger then 440 /* An rc of 5 indicates that the record was bigger than
441 * the buffer, which is OK for us. A 9 indicates that the 441 * the buffer, which is OK for us. A 9 indicates that the
442 * record was purged befor we could receive it. 442 * record was purged befor we could receive it.
443 */ 443 */