diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-07-12 11:15:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-07-12 12:03:50 -0400 |
| commit | a7ce2e0d04b1a6ee8056e7fea5ea96566d33a6f4 (patch) | |
| tree | 90242f78a02b1dab3ad02a61ee2ab017245be599 | |
| parent | e3845deeb7b00d04d332219628c28b42b7b42a76 (diff) | |
fix comnment/printk typos concerning "empty"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | Documentation/scsi/ChangeLog.lpfc | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/dma-mx1-mx2.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 | ||||
| -rw-r--r-- | drivers/serial/nwpserial.c | 2 | ||||
| -rw-r--r-- | sound/usb/pcm.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc index e759e92e286d..337c924cc81f 100644 --- a/Documentation/scsi/ChangeLog.lpfc +++ b/Documentation/scsi/ChangeLog.lpfc | |||
| @@ -807,7 +807,7 @@ Changes from 20040908 to 20040920 | |||
| 807 | lpfc_disc_done/lpfc_do_dpc cleanup - lpfc_disc_done can return | 807 | lpfc_disc_done/lpfc_do_dpc cleanup - lpfc_disc_done can return |
| 808 | void - move lpfc_do_dpc and lpfc_disc_done to lpfc_hbadisc.c - | 808 | void - move lpfc_do_dpc and lpfc_disc_done to lpfc_hbadisc.c - |
| 809 | remove checking of list emptiness before calling lpfc_disc_done, | 809 | remove checking of list emptiness before calling lpfc_disc_done, |
| 810 | it handles the emtpy list case just fine and the additional | 810 | it handles the empty list case just fine and the additional |
| 811 | instructions cost less then the bustlocked spinlock operations. | 811 | instructions cost less then the bustlocked spinlock operations. |
| 812 | * Integrated patch from Christoph Hellwig: This adds a new 64bit | 812 | * Integrated patch from Christoph Hellwig: This adds a new 64bit |
| 813 | counter instead, brd_no isn't reused anymore. Also some tiny | 813 | counter instead, brd_no isn't reused anymore. Also some tiny |
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index 3765ac0d671a..68988af19b1c 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c | |||
| @@ -310,7 +310,7 @@ imx_dma_setup_sg(int channel, | |||
| 310 | imxdma->resbytes = dma_length; | 310 | imxdma->resbytes = dma_length; |
| 311 | 311 | ||
| 312 | if (!sg || !sgcount) { | 312 | if (!sg || !sgcount) { |
| 313 | printk(KERN_ERR "imxdma%d: imx_dma_setup_sg epty sg list\n", | 313 | printk(KERN_ERR "imxdma%d: imx_dma_setup_sg empty sg list\n", |
| 314 | channel); | 314 | channel); |
| 315 | return -EINVAL; | 315 | return -EINVAL; |
| 316 | } | 316 | } |
diff --git a/drivers/scsi/aic7xxx_old/aic7xxx.seq b/drivers/scsi/aic7xxx_old/aic7xxx.seq index f6fc4b75b5a5..5997e7c3a191 100644 --- a/drivers/scsi/aic7xxx_old/aic7xxx.seq +++ b/drivers/scsi/aic7xxx_old/aic7xxx.seq | |||
| @@ -615,7 +615,7 @@ ultra2_dmafifoflush: | |||
| 615 | * went empty and the next bit of data is copied from | 615 | * went empty and the next bit of data is copied from |
| 616 | * the SCSI fifo into the PCI fifo. It should only | 616 | * the SCSI fifo into the PCI fifo. It should only |
| 617 | * come on when both FIFOs (meaning the entire FIFO | 617 | * come on when both FIFOs (meaning the entire FIFO |
| 618 | * chain) are emtpy. Since it can take up to 4 cycles | 618 | * chain) are empty. Since it can take up to 4 cycles |
| 619 | * for new data to be copied from the SCSI fifo into | 619 | * for new data to be copied from the SCSI fifo into |
| 620 | * the PCI fifo, testing for FIFOEMP status for 4 | 620 | * the PCI fifo, testing for FIFOEMP status for 4 |
| 621 | * extra times gives the needed time for any | 621 | * extra times gives the needed time for any |
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c index 3c02fa96f282..e65b0d9202a5 100644 --- a/drivers/serial/nwpserial.c +++ b/drivers/serial/nwpserial.c | |||
| @@ -81,7 +81,7 @@ nwpserial_console_write(struct console *co, const char *s, unsigned int count) | |||
| 81 | 81 | ||
| 82 | uart_console_write(&up->port, s, count, nwpserial_console_putchar); | 82 | uart_console_write(&up->port, s, count, nwpserial_console_putchar); |
| 83 | 83 | ||
| 84 | /* wait for transmitter to become emtpy */ | 84 | /* wait for transmitter to become empty */ |
| 85 | while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0) | 85 | while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0) |
| 86 | cpu_relax(); | 86 | cpu_relax(); |
| 87 | 87 | ||
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 456829882f40..3634cedf9306 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c | |||
| @@ -636,7 +636,7 @@ static int hw_rule_period_time(struct snd_pcm_hw_params *params, | |||
| 636 | min_datainterval = min(min_datainterval, fp->datainterval); | 636 | min_datainterval = min(min_datainterval, fp->datainterval); |
| 637 | } | 637 | } |
| 638 | if (min_datainterval == 0xff) { | 638 | if (min_datainterval == 0xff) { |
| 639 | hwc_debug(" --> get emtpy\n"); | 639 | hwc_debug(" --> get empty\n"); |
| 640 | it->empty = 1; | 640 | it->empty = 1; |
| 641 | return -EINVAL; | 641 | return -EINVAL; |
| 642 | } | 642 | } |
