diff options
-rw-r--r-- | drivers/media/rc/ene_ir.c | 2 | ||||
-rw-r--r-- | drivers/media/rc/ene_ir.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 | ||||
-rw-r--r-- | drivers/scsi/gdth.h | 2 | ||||
-rw-r--r-- | drivers/usb/musb/cppi_dma.c | 2 | ||||
-rw-r--r-- | drivers/video/bf54x-lq043fb.c | 2 | ||||
-rw-r--r-- | drivers/video/bfin-t350mcqb-fb.c | 2 | ||||
-rw-r--r-- | fs/ext4/inode.c | 2 | ||||
-rw-r--r-- | fs/jbd/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/jbd2/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_buf.c | 2 | ||||
-rw-r--r-- | lib/decompress_bunzip2.c | 4 | ||||
-rw-r--r-- | lib/decompress_unlzma.c | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c index cf10ecf5acec..860c112e0fd2 100644 --- a/drivers/media/rc/ene_ir.c +++ b/drivers/media/rc/ene_ir.c | |||
@@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev) | |||
324 | return dev->extra_buf2_address + r_pointer; | 324 | return dev->extra_buf2_address + r_pointer; |
325 | } | 325 | } |
326 | 326 | ||
327 | dbg("attempt to read beyong ring bufer end"); | 327 | dbg("attempt to read beyond ring buffer end"); |
328 | return 0; | 328 | return 0; |
329 | } | 329 | } |
330 | 330 | ||
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h index fd108d90f750..6f978e85db8c 100644 --- a/drivers/media/rc/ene_ir.h +++ b/drivers/media/rc/ene_ir.h | |||
@@ -227,7 +227,7 @@ struct ene_device { | |||
227 | 227 | ||
228 | /* TX buffer */ | 228 | /* TX buffer */ |
229 | unsigned *tx_buffer; /* input samples buffer*/ | 229 | unsigned *tx_buffer; /* input samples buffer*/ |
230 | int tx_pos; /* position in that bufer */ | 230 | int tx_pos; /* position in that buffer */ |
231 | int tx_len; /* current len of tx buffer */ | 231 | int tx_len; /* current len of tx buffer */ |
232 | int tx_done; /* done transmitting */ | 232 | int tx_done; /* done transmitting */ |
233 | /* one more sample pending*/ | 233 | /* one more sample pending*/ |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index 8d5d55ad102d..39b9de71a207 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c | |||
@@ -684,7 +684,7 @@ out: | |||
684 | /* | 684 | /* |
685 | * Update our accounting state to incorporate the new Free List | 685 | * Update our accounting state to incorporate the new Free List |
686 | * buffers, tell the hardware about them and return the number of | 686 | * buffers, tell the hardware about them and return the number of |
687 | * bufers which we were able to allocate. | 687 | * buffers which we were able to allocate. |
688 | */ | 688 | */ |
689 | cred = fl->avail - cred; | 689 | cred = fl->avail - cred; |
690 | fl->pend_cred += cred; | 690 | fl->pend_cred += cred; |
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index d969855ac64a..d3e4d7c6f577 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h | |||
@@ -359,7 +359,7 @@ typedef struct { | |||
359 | u32 cmd_buff_addr2; /* physical address of cmd buffer 1 */ | 359 | u32 cmd_buff_addr2; /* physical address of cmd buffer 1 */ |
360 | u32 cmd_buff_u_addr2; /* reserved for 64 bit addressing */ | 360 | u32 cmd_buff_u_addr2; /* reserved for 64 bit addressing */ |
361 | u32 cmd_buff_indx2; /* cmd buf addr1 unique identifier */ | 361 | u32 cmd_buff_indx2; /* cmd buf addr1 unique identifier */ |
362 | u32 cmd_buff_size; /* size of each cmd bufer in bytes */ | 362 | u32 cmd_buff_size; /* size of each cmd buffer in bytes */ |
363 | u32 reserved1; | 363 | u32 reserved1; |
364 | u32 reserved2; | 364 | u32 reserved2; |
365 | } __attribute__((packed)) gdth_perf_modes; | 365 | } __attribute__((packed)) gdth_perf_modes; |
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 318fb4e8a885..53be7aef6308 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c | |||
@@ -513,7 +513,7 @@ static inline int cppi_autoreq_update(struct cppi_channel *rx, | |||
513 | if (!(val & MUSB_RXCSR_H_REQPKT)) { | 513 | if (!(val & MUSB_RXCSR_H_REQPKT)) { |
514 | val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS; | 514 | val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS; |
515 | musb_writew(regs, MUSB_RXCSR, val); | 515 | musb_writew(regs, MUSB_RXCSR, val); |
516 | /* flush writebufer */ | 516 | /* flush writebuffer */ |
517 | val = musb_readw(regs, MUSB_RXCSR); | 517 | val = musb_readw(regs, MUSB_RXCSR); |
518 | } | 518 | } |
519 | } | 519 | } |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 56720fb476b3..46b03f53985f 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> | 4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> |
5 | * | 5 | * |
6 | * Created: | 6 | * Created: |
7 | * Description: ADSP-BF54x Framebufer driver | 7 | * Description: ADSP-BF54x Framebuffer driver |
8 | * | 8 | * |
9 | * | 9 | * |
10 | * Modified: | 10 | * Modified: |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index d5e126759612..7a0c05f3537e 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> | 4 | * Author: Michael Hennerich <hennerich@blackfin.uclinux.org> |
5 | * | 5 | * |
6 | * Created: | 6 | * Created: |
7 | * Description: Blackfin LCD Framebufer driver | 7 | * Description: Blackfin LCD Framebuffer driver |
8 | * | 8 | * |
9 | * | 9 | * |
10 | * Modified: | 10 | * Modified: |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b1c57bf43132..d87991d71a1c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -1878,7 +1878,7 @@ static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate); | |||
1878 | * a[0] = 'a'; | 1878 | * a[0] = 'a'; |
1879 | * truncate(f, 4096); | 1879 | * truncate(f, 4096); |
1880 | * we have in the page first buffer_head mapped via page_mkwrite call back | 1880 | * we have in the page first buffer_head mapped via page_mkwrite call back |
1881 | * but other bufer_heads would be unmapped but dirty(dirty done via the | 1881 | * but other buffer_heads would be unmapped but dirty (dirty done via the |
1882 | * do_wp_page). So writepage should write the first block. If we modify | 1882 | * do_wp_page). So writepage should write the first block. If we modify |
1883 | * the mmap area beyond 1024 we will again get a page_fault and the | 1883 | * the mmap area beyond 1024 we will again get a page_fault and the |
1884 | * page_mkwrite callback will do the block allocation and mark the | 1884 | * page_mkwrite callback will do the block allocation and mark the |
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index f94fc48ff3a0..5d1a00a5041b 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
@@ -537,7 +537,7 @@ int cleanup_journal_tail(journal_t *journal) | |||
537 | * them. | 537 | * them. |
538 | * | 538 | * |
539 | * Called with j_list_lock held. | 539 | * Called with j_list_lock held. |
540 | * Returns number of bufers reaped (for debug) | 540 | * Returns number of buffers reaped (for debug) |
541 | */ | 541 | */ |
542 | 542 | ||
543 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) | 543 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) |
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 16a698bd906d..d49d202903fb 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c | |||
@@ -565,7 +565,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal) | |||
565 | * | 565 | * |
566 | * Called with the journal locked. | 566 | * Called with the journal locked. |
567 | * Called with j_list_lock held. | 567 | * Called with j_list_lock held. |
568 | * Returns number of bufers reaped (for debug) | 568 | * Returns number of buffers reaped (for debug) |
569 | */ | 569 | */ |
570 | 570 | ||
571 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) | 571 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) |
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index cf0ac056815f..33e06d22168c 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
@@ -1370,7 +1370,7 @@ restart: | |||
1370 | goto restart; | 1370 | goto restart; |
1371 | } | 1371 | } |
1372 | /* | 1372 | /* |
1373 | * clear the LRU reference count so the bufer doesn't get | 1373 | * clear the LRU reference count so the buffer doesn't get |
1374 | * ignored in xfs_buf_rele(). | 1374 | * ignored in xfs_buf_rele(). |
1375 | */ | 1375 | */ |
1376 | atomic_set(&bp->b_lru_ref, 0); | 1376 | atomic_set(&bp->b_lru_ref, 0); |
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index a7b80c1d6a0d..3380297768d8 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c | |||
@@ -691,7 +691,7 @@ STATIC int INIT bunzip2(unsigned char *buf, int len, | |||
691 | outbuf = malloc(BZIP2_IOBUF_SIZE); | 691 | outbuf = malloc(BZIP2_IOBUF_SIZE); |
692 | 692 | ||
693 | if (!outbuf) { | 693 | if (!outbuf) { |
694 | error("Could not allocate output bufer"); | 694 | error("Could not allocate output buffer"); |
695 | return RETVAL_OUT_OF_MEMORY; | 695 | return RETVAL_OUT_OF_MEMORY; |
696 | } | 696 | } |
697 | if (buf) | 697 | if (buf) |
@@ -699,7 +699,7 @@ STATIC int INIT bunzip2(unsigned char *buf, int len, | |||
699 | else | 699 | else |
700 | inbuf = malloc(BZIP2_IOBUF_SIZE); | 700 | inbuf = malloc(BZIP2_IOBUF_SIZE); |
701 | if (!inbuf) { | 701 | if (!inbuf) { |
702 | error("Could not allocate input bufer"); | 702 | error("Could not allocate input buffer"); |
703 | i = RETVAL_OUT_OF_MEMORY; | 703 | i = RETVAL_OUT_OF_MEMORY; |
704 | goto exit_0; | 704 | goto exit_0; |
705 | } | 705 | } |
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 476c65af9709..32adb73a9038 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c | |||
@@ -562,7 +562,7 @@ STATIC inline int INIT unlzma(unsigned char *buf, int in_len, | |||
562 | else | 562 | else |
563 | inbuf = malloc(LZMA_IOBUF_SIZE); | 563 | inbuf = malloc(LZMA_IOBUF_SIZE); |
564 | if (!inbuf) { | 564 | if (!inbuf) { |
565 | error("Could not allocate input bufer"); | 565 | error("Could not allocate input buffer"); |
566 | goto exit_0; | 566 | goto exit_0; |
567 | } | 567 | } |
568 | 568 | ||