From: Tomas Winkler Date: Wed, 9 Nov 2011 11:26:36 +0000 (-0300) Subject: [media] easycap: drop initializations to 0 in the probe functions X-Git-Tag: v3.3-rc1~48^2~513 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7dfdae8e32a26ef3b3aa8d114d2fed93d7680169;p=~emulex%2Finfiniband.git [media] easycap: drop initializations to 0 in the probe functions peasycap was allocated using kzalloc so drop all to zero initializations Signed-off-by: Tomas Winkler Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c index 044c762f337..8da1682aa64 100644 --- a/drivers/staging/media/easycap/easycap_main.c +++ b/drivers/staging/media/easycap/easycap_main.c @@ -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; /*---------------------------------------------------------------------------*/ /* @@ -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; @@ -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 ... @@ -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;