diff options
| author | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 16:43:30 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 16:43:30 -0500 |
| commit | ddf3e298b33f3e15a2e6272e0146dfa940c89a74 (patch) | |
| tree | cd474d1eca4f337958e97a09dcb0974b1f8aba82 /drivers/usb/media/pwc/pwc-if.c | |
| parent | 7a694ca74958b97ae2d437c8a730bddd9e9792c3 (diff) | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/usb/media/pwc/pwc-if.c')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index c53e2263b7f..cca47f480a8 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c @@ -272,7 +272,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev) return -ENXIO; } #endif - /* Allocate Isochronuous pipe buffers */ + /* Allocate Isochronous pipe buffers */ for (i = 0; i < MAX_ISO_BUFS; i++) { if (pdev->sbuf[i].data == NULL) { kbuf = kmalloc(ISO_BUFFER_SIZE, GFP_KERNEL); @@ -850,7 +850,7 @@ static int pwc_isoc_init(struct pwc_device *pdev) if (pdev->vmax_packet_size < 0 || pdev->vmax_packet_size > ISO_MAX_FRAME_SIZE) { Err("Failed to find packet size for video endpoint in current alternate setting.\n"); - return -ENFILE; /* Odd error, that should be noticable */ + return -ENFILE; /* Odd error, that should be noticeable */ } /* Set alternate interface */ @@ -2128,7 +2128,7 @@ static int __init usb_pwc_init(void) if (leds[1] >= 0) led_off = leds[1]; - /* Big device node whoopla. Basicly, it allows you to assign a + /* Big device node whoopla. Basically, it allows you to assign a device node (/dev/videoX) to a camera, based on its type & serial number. The format is [type[.serialnumber]:]node. |