diff options
Diffstat (limited to 'drivers/media/video/gspca/ov519.c')
-rw-r--r-- | drivers/media/video/gspca/ov519.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index 4062aed24139..19378dde27c6 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -1376,8 +1376,8 @@ error: | |||
1376 | return -EBUSY; | 1376 | return -EBUSY; |
1377 | } | 1377 | } |
1378 | 1378 | ||
1379 | /* this function is called at open time */ | 1379 | /* this function is called at probe and resume time */ |
1380 | static int sd_open(struct gspca_dev *gspca_dev) | 1380 | static int sd_init(struct gspca_dev *gspca_dev) |
1381 | { | 1381 | { |
1382 | struct sd *sd = (struct sd *) gspca_dev; | 1382 | struct sd *sd = (struct sd *) gspca_dev; |
1383 | 1383 | ||
@@ -1877,14 +1877,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
1877 | ov51x_led_control((struct sd *) gspca_dev, 0); | 1877 | ov51x_led_control((struct sd *) gspca_dev, 0); |
1878 | } | 1878 | } |
1879 | 1879 | ||
1880 | static void sd_stop0(struct gspca_dev *gspca_dev) | ||
1881 | { | ||
1882 | } | ||
1883 | |||
1884 | static void sd_close(struct gspca_dev *gspca_dev) | ||
1885 | { | ||
1886 | } | ||
1887 | |||
1888 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, | 1880 | static void sd_pkt_scan(struct gspca_dev *gspca_dev, |
1889 | struct gspca_frame *frame, /* target */ | 1881 | struct gspca_frame *frame, /* target */ |
1890 | __u8 *data, /* isoc packet */ | 1882 | __u8 *data, /* isoc packet */ |
@@ -2141,11 +2133,9 @@ static const struct sd_desc sd_desc = { | |||
2141 | .ctrls = sd_ctrls, | 2133 | .ctrls = sd_ctrls, |
2142 | .nctrls = ARRAY_SIZE(sd_ctrls), | 2134 | .nctrls = ARRAY_SIZE(sd_ctrls), |
2143 | .config = sd_config, | 2135 | .config = sd_config, |
2144 | .open = sd_open, | 2136 | .init = sd_init, |
2145 | .start = sd_start, | 2137 | .start = sd_start, |
2146 | .stopN = sd_stopN, | 2138 | .stopN = sd_stopN, |
2147 | .stop0 = sd_stop0, | ||
2148 | .close = sd_close, | ||
2149 | .pkt_scan = sd_pkt_scan, | 2139 | .pkt_scan = sd_pkt_scan, |
2150 | }; | 2140 | }; |
2151 | 2141 | ||