diff options
Diffstat (limited to 'drivers/usb/media/pwc/pwc-if.c')
-rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index 100a5a4f03a3..cca47f480a8b 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c | |||
@@ -129,7 +129,7 @@ static int default_mbufs = 2; /* Default number of mmap() buffers */ | |||
129 | int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX; | 129 | int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX; |
130 | static int power_save = 0; | 130 | static int power_save = 0; |
131 | static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */ | 131 | static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */ |
132 | int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */ | 132 | static int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */ |
133 | static struct { | 133 | static struct { |
134 | int type; | 134 | int type; |
135 | char serial_number[30]; | 135 | char serial_number[30]; |
@@ -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); |
@@ -322,7 +322,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev) | |||
322 | case 730: | 322 | case 730: |
323 | case 740: | 323 | case 740: |
324 | case 750: | 324 | case 750: |
325 | Trace(TRACE_MEMORY,"private_data(%Zd)\n",sizeof(struct pwc_dec23_private)); | 325 | Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private)); |
326 | kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL); /* Timon & Kiara */ | 326 | kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL); /* Timon & Kiara */ |
327 | break; | 327 | break; |
328 | case 645: | 328 | case 645: |
@@ -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 */ |
@@ -1179,7 +1179,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf, | |||
1179 | DECLARE_WAITQUEUE(wait, current); | 1179 | DECLARE_WAITQUEUE(wait, current); |
1180 | int bytes_to_read; | 1180 | int bytes_to_read; |
1181 | 1181 | ||
1182 | Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count); | 1182 | Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count); |
1183 | if (vdev == NULL) | 1183 | if (vdev == NULL) |
1184 | return -EFAULT; | 1184 | return -EFAULT; |
1185 | pdev = vdev->priv; | 1185 | pdev = vdev->priv; |
@@ -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 | ||