From 12730ade11f9a4d6ae447d66b921dad174e77aaa Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Fri, 8 Jan 2010 08:08:12 -0300 Subject: [PATCH] --- yaml --- r: 181475 b: refs/heads/master c: 509245171ae76e08f657fe825b739d99f5701f09 h: refs/heads/master i: 181473: f6bd29c8b4f2ae3f57f42d6103b5851d0c6520c8 181471: 83434ab7387c1d412d2b8c658a987e29505f5d7d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/zc3xx.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 082fcce4fcd2..609767ed2f09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77880ba3335e60acd0d6a818a7cdddaf0a5d601f +refs/heads/master: 509245171ae76e08f657fe825b739d99f5701f09 diff --git a/trunk/drivers/media/video/gspca/zc3xx.c b/trunk/drivers/media/video/gspca/zc3xx.c index 87deb72f89d0..1c403a2fccbe 100644 --- a/trunk/drivers/media/video/gspca/zc3xx.c +++ b/trunk/drivers/media/video/gspca/zc3xx.c @@ -6783,7 +6783,6 @@ static int sd_start(struct gspca_dev *gspca_dev) { struct sd *sd = (struct sd *) gspca_dev; struct usb_device *dev = gspca_dev->dev; - const struct usb_action *zc3_init; int mode; static const struct usb_action *init_tb[SENSOR_MAX][2] = { {adcm2700_Initial, adcm2700_InitialScale}, /* 0 */ @@ -6816,8 +6815,7 @@ static int sd_start(struct gspca_dev *gspca_dev) 0x21); /* JPEG 422 */ jpeg_set_qual(sd->jpeg_hdr, sd->quality); - mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv; - zc3_init = init_tb[sd->sensor][mode]; + mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv; switch (sd->sensor) { case SENSOR_HV7131C: zcxx_probeSensor(gspca_dev); @@ -6826,7 +6824,7 @@ static int sd_start(struct gspca_dev *gspca_dev) usb_exchange(gspca_dev, pas106b_Initial_com); break; } - usb_exchange(gspca_dev, zc3_init); + usb_exchange(gspca_dev, init_tb[sd->sensor][mode]); switch (sd->sensor) { case SENSOR_ADCM2700: