diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:43:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:43:57 -0300 |
| commit | 56e4c75fce1cca2ee4553fd47b31dc8b6d43d688 (patch) | |
| tree | cf92072da97e8aea3315303ac188d4f8432d42a8 /linux/drivers/media/video/gspca/spca505.c | |
| parent | 937ba8f2a0dc3b8cdb98de9a48c256ad24427ac9 (diff) | |
| parent | 9bcda4998b34e63d38d390763cdbda7706f033d9 (diff) | |
| download | mediapointer-dvb-s2-56e4c75fce1cca2ee4553fd47b31dc8b6d43d688.tar.gz mediapointer-dvb-s2-56e4c75fce1cca2ee4553fd47b31dc8b6d43d688.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dev
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/gspca/spca505.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/spca505.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linux/drivers/media/video/gspca/spca505.c b/linux/drivers/media/video/gspca/spca505.c index 440e6853c..e33666df4 100644 --- a/linux/drivers/media/video/gspca/spca505.c +++ b/linux/drivers/media/video/gspca/spca505.c @@ -724,8 +724,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; int ret; @@ -812,11 +812,6 @@ static void sd_stopN(struct gspca_dev *gspca_dev) static void sd_stop0(struct gspca_dev *gspca_dev) { -} - -/* this function is called at close time */ -static void sd_close(struct gspca_dev *gspca_dev) -{ /* This maybe reset or power control */ reg_write(gspca_dev->dev, 0x03, 0x03, 0x20); reg_write(gspca_dev->dev, 0x03, 0x01, 0x0); @@ -894,11 +889,10 @@ static const 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, }; |