Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285293
b: refs/heads/master
c: 7dfdae8
h: refs/heads/master
i:
  285291: 89bf111
v: v3
  • Loading branch information
Tomas Winkler authored and Mauro Carvalho Chehab committed Nov 24, 2011
1 parent b92e6ef commit ebdb765
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 101dca425da49edb3093000d72490216fa322911
refs/heads/master: 7dfdae8e32a26ef3b3aa8d114d2fed93d7680169
29 changes: 3 additions & 26 deletions trunk/drivers/staging/media/easycap/easycap_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3005,11 +3005,6 @@ static int easycap_usb_probe(struct usb_interface *intf,
mutex_unlock(&mutex_dongle);

peasycap->allocation_video_struct = sizeof(struct easycap);
peasycap->allocation_video_page = 0;
peasycap->allocation_video_urb = 0;
peasycap->allocation_audio_struct = 0;
peasycap->allocation_audio_page = 0;
peasycap->allocation_audio_urb = 0;

/*---------------------------------------------------------------------------*/
/*
Expand All @@ -3019,7 +3014,6 @@ static int easycap_usb_probe(struct usb_interface *intf,
peasycap->pusb_device = usbdev;
peasycap->pusb_interface = intf;

peasycap->ilk = 0;
peasycap->microphone = false;

peasycap->video_interface = -1;
Expand All @@ -3038,11 +3032,6 @@ static int easycap_usb_probe(struct usb_interface *intf,

peasycap->frame_buffer_many = FRAME_BUFFER_MANY;

for (k = 0; k < INPUT_MANY; k++)
peasycap->lost[k] = 0;
peasycap->skip = 0;
peasycap->skipped = 0;
peasycap->offerfields = 0;
/*---------------------------------------------------------------------------*/
/*
* DYNAMICALLY FILL IN THE AVAILABLE FORMATS ...
Expand All @@ -3054,22 +3043,10 @@ static int easycap_usb_probe(struct usb_interface *intf,
return -EFAULT;
}
JOM(4, "%i formats available\n", rc);
/*---------------------------------------------------------------------------*/
/*
* ... AND POPULATE easycap.inputset[]
*/
/*---------------------------------------------------------------------------*/
/* FIXME: maybe we just use memset 0 */

/* ... AND POPULATE easycap.inputset[] */

inputset = peasycap->inputset;
for (k = 0; k < INPUT_MANY; k++) {
inputset[k].input_ok = 0;
inputset[k].standard_offset_ok = 0;
inputset[k].format_offset_ok = 0;
inputset[k].brightness_ok = 0;
inputset[k].contrast_ok = 0;
inputset[k].saturation_ok = 0;
inputset[k].hue_ok = 0;
}

fmtidx = peasycap->ntsc ? NTSC_M : PAL_BGHIN;
m = 0;
Expand Down

0 comments on commit ebdb765

Please sign in to comment.