Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / drivers / media / video / cpia2 / cpia2_usb.c

diff --git a/drivers/media/video/cpia2/cpia2_usb.c b/drivers/media/video/cpia2/cpia2_usb.c
index d8e929863a88d9305ecaefff2b8378fd06b9d374..a4574740350df30cf6bd3cb84592b8c84d39f779 100644 (file)
--- a/drivers/media/video/cpia2/cpia2_usb.c
+++ b/drivers/media/video/cpia2/cpia2_usb.c
@@ -84,7 +84,7 @@ static struct usb_driver cpia2_driver = {
  *****************************************************************************/
 static void process_frame(struct camera_data *cam)
 {
-       static int frame_count = 0;
+       static int frame_count;
 
        unsigned char *inbuff = cam->workbuff->data;