diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 19:20:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 19:20:52 -0300 |
| commit | dee4b1d79231d5ddf2f0e3b033be9f7264301a7f (patch) | |
| tree | b2ff69c2739c3ac8e1a2321bd1848b96b97e79ea /linux/drivers/media/video/gspca/spca500.c | |
| parent | f0bd418f304b9b8c3723476cf2479d39d517eae2 (diff) | |
| parent | 69ede27e441eb8b267b1899c5046e06d069b3043 (diff) | |
| download | mediapointer-dvb-s2-dee4b1d79231d5ddf2f0e3b033be9f7264301a7f.tar.gz mediapointer-dvb-s2-dee4b1d79231d5ddf2f0e3b033be9f7264301a7f.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/gspca/spca500.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/spca500.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/linux/drivers/media/video/gspca/spca500.c b/linux/drivers/media/video/gspca/spca500.c index 2aff5af9a..c33bfe48c 100644 --- a/linux/drivers/media/video/gspca/spca500.c +++ b/linux/drivers/media/video/gspca/spca500.c @@ -662,8 +662,8 @@ static int sd_config(struct gspca_dev *gspca_dev, return 0; } -/* this function is called at open time */ -static int sd_open(struct gspca_dev *gspca_dev) +/* this function is called at probe and resume time */ +static int sd_init(struct gspca_dev *gspca_dev) { struct sd *sd = (struct sd *) gspca_dev; @@ -897,14 +897,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev) gspca_dev->usb_buf[0]); } -static void sd_stop0(struct gspca_dev *gspca_dev) -{ -} - -static void sd_close(struct gspca_dev *gspca_dev) -{ -} - static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame, /* target */ __u8 *data, /* isoc packet */ @@ -1068,11 +1060,9 @@ static struct sd_desc sd_desc = { .ctrls = sd_ctrls, .nctrls = ARRAY_SIZE(sd_ctrls), .config = sd_config, - .open = sd_open, + .init = sd_init, .start = sd_start, .stopN = sd_stopN, - .stop0 = sd_stop0, - .close = sd_close, .pkt_scan = sd_pkt_scan, }; |