diff options
Diffstat (limited to 'drivers/usb/media')
-rw-r--r-- | drivers/usb/media/ov511.c | 2 | ||||
-rw-r--r-- | drivers/usb/media/pwc/pwc-ctrl.c | 2 | ||||
-rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 6 | ||||
-rw-r--r-- | drivers/usb/media/pwc/pwc-ioctl.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c index d6051822416e..036c485d1d1e 100644 --- a/drivers/usb/media/ov511.c +++ b/drivers/usb/media/ov511.c | |||
@@ -5041,7 +5041,7 @@ ov6xx0_configure(struct usb_ov511 *ov) | |||
5041 | { OV511_I2C_BUS, 0x2a, 0x04 }, /* Disable framerate adjust */ | 5041 | { OV511_I2C_BUS, 0x2a, 0x04 }, /* Disable framerate adjust */ |
5042 | // { OV511_I2C_BUS, 0x2b, 0xac }, /* Framerate; Set 2a[7] first */ | 5042 | // { OV511_I2C_BUS, 0x2b, 0xac }, /* Framerate; Set 2a[7] first */ |
5043 | { OV511_I2C_BUS, 0x2d, 0x99 }, | 5043 | { OV511_I2C_BUS, 0x2d, 0x99 }, |
5044 | { OV511_I2C_BUS, 0x33, 0xa0 }, /* Color Procesing Parameter */ | 5044 | { OV511_I2C_BUS, 0x33, 0xa0 }, /* Color Processing Parameter */ |
5045 | { OV511_I2C_BUS, 0x34, 0xd2 }, /* Max A/D range */ | 5045 | { OV511_I2C_BUS, 0x34, 0xd2 }, /* Max A/D range */ |
5046 | { OV511_I2C_BUS, 0x38, 0x8b }, | 5046 | { OV511_I2C_BUS, 0x38, 0x8b }, |
5047 | { OV511_I2C_BUS, 0x39, 0x40 }, | 5047 | { OV511_I2C_BUS, 0x39, 0x40 }, |
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c index 42352f531bc0..42ec468d52d6 100644 --- a/drivers/usb/media/pwc/pwc-ctrl.c +++ b/drivers/usb/media/pwc/pwc-ctrl.c | |||
@@ -1100,7 +1100,7 @@ static inline int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt) | |||
1100 | unsigned char buf[4]; | 1100 | unsigned char buf[4]; |
1101 | 1101 | ||
1102 | /* set new relative angle; angles are expressed in degrees * 100, | 1102 | /* set new relative angle; angles are expressed in degrees * 100, |
1103 | but cam as .5 degree resolution, hence devide by 200. Also | 1103 | but cam as .5 degree resolution, hence divide by 200. Also |
1104 | the angle must be multiplied by 64 before it's send to | 1104 | the angle must be multiplied by 64 before it's send to |
1105 | the cam (??) | 1105 | the cam (??) |
1106 | */ | 1106 | */ |
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index c53e2263b7fb..cca47f480a8b 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) | |||
272 | return -ENXIO; | 272 | return -ENXIO; |
273 | } | 273 | } |
274 | #endif | 274 | #endif |
275 | /* Allocate Isochronuous pipe buffers */ | 275 | /* Allocate Isochronous pipe buffers */ |
276 | for (i = 0; i < MAX_ISO_BUFS; i++) { | 276 | for (i = 0; i < MAX_ISO_BUFS; i++) { |
277 | if (pdev->sbuf[i].data == NULL) { | 277 | if (pdev->sbuf[i].data == NULL) { |
278 | kbuf = kmalloc(ISO_BUFFER_SIZE, GFP_KERNEL); | 278 | kbuf = kmalloc(ISO_BUFFER_SIZE, GFP_KERNEL); |
@@ -850,7 +850,7 @@ static int pwc_isoc_init(struct pwc_device *pdev) | |||
850 | 850 | ||
851 | if (pdev->vmax_packet_size < 0 || pdev->vmax_packet_size > ISO_MAX_FRAME_SIZE) { | 851 | if (pdev->vmax_packet_size < 0 || pdev->vmax_packet_size > ISO_MAX_FRAME_SIZE) { |
852 | Err("Failed to find packet size for video endpoint in current alternate setting.\n"); | 852 | Err("Failed to find packet size for video endpoint in current alternate setting.\n"); |
853 | return -ENFILE; /* Odd error, that should be noticable */ | 853 | return -ENFILE; /* Odd error, that should be noticeable */ |
854 | } | 854 | } |
855 | 855 | ||
856 | /* Set alternate interface */ | 856 | /* Set alternate interface */ |
@@ -2128,7 +2128,7 @@ static int __init usb_pwc_init(void) | |||
2128 | if (leds[1] >= 0) | 2128 | if (leds[1] >= 0) |
2129 | led_off = leds[1]; | 2129 | led_off = leds[1]; |
2130 | 2130 | ||
2131 | /* Big device node whoopla. Basicly, it allows you to assign a | 2131 | /* Big device node whoopla. Basically, it allows you to assign a |
2132 | device node (/dev/videoX) to a camera, based on its type | 2132 | device node (/dev/videoX) to a camera, based on its type |
2133 | & serial number. The format is [type[.serialnumber]:]node. | 2133 | & serial number. The format is [type[.serialnumber]:]node. |
2134 | 2134 | ||
diff --git a/drivers/usb/media/pwc/pwc-ioctl.h b/drivers/usb/media/pwc/pwc-ioctl.h index 65805eaa9a1c..5f9cb08bc02e 100644 --- a/drivers/usb/media/pwc/pwc-ioctl.h +++ b/drivers/usb/media/pwc/pwc-ioctl.h | |||
@@ -75,7 +75,7 @@ | |||
75 | #define PWC_FPS_SNAPSHOT 0x00400000 | 75 | #define PWC_FPS_SNAPSHOT 0x00400000 |
76 | 76 | ||
77 | 77 | ||
78 | /* structure for transfering x & y coordinates */ | 78 | /* structure for transferring x & y coordinates */ |
79 | struct pwc_coord | 79 | struct pwc_coord |
80 | { | 80 | { |
81 | int x, y; /* guess what */ | 81 | int x, y; /* guess what */ |