diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-27 10:00:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-27 10:00:00 -0200 |
| commit | a1e782e39b16be26c0d2a5a18f29cc85251d2cb1 (patch) | |
| tree | 50d18ef06895d1a6b4906fae13ce809c9f429c98 /linux | |
| parent | 698f109d2265f635cf7216c68a836d0a11a5ac8a (diff) | |
| download | mediapointer-dvb-s2-a1e782e39b16be26c0d2a5a18f29cc85251d2cb1.tar.gz mediapointer-dvb-s2-a1e782e39b16be26c0d2a5a18f29cc85251d2cb1.tar.bz2 | |
em28xx: fix gpio settings
From: Mauro Carvalho Chehab <mchehab@redhat.com>
A previous changeset moved gpio from em28xx struct into em28xx_board.
However, the driver were not updated to properly honor those gpio's.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c index d63e5b997..729120807 100644 --- a/linux/drivers/media/video/em28xx/em28xx-core.c +++ b/linux/drivers/media/video/em28xx/em28xx-core.c @@ -784,9 +784,9 @@ int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode) dev->mode = set_mode; if (dev->mode == EM28XX_DIGITAL_MODE) - return em28xx_gpio_set(dev, dev->digital_gpio); + return em28xx_gpio_set(dev, dev->board.dvb_gpio); else - return em28xx_gpio_set(dev, dev->analog_gpio); + return em28xx_gpio_set(dev, INPUT(dev->ctl_input)->gpio); } EXPORT_SYMBOL_GPL(em28xx_set_mode); diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h index 1171578a8..62921982f 100644 --- a/linux/drivers/media/video/em28xx/em28xx.h +++ b/linux/drivers/media/video/em28xx/em28xx.h @@ -440,9 +440,6 @@ struct em28xx { /* Some older em28xx chips needs a waiting time after writing */ unsigned int wait_after_write; - /* GPIO sequences for analog and digital mode */ - struct em28xx_reg_seq *analog_gpio, *digital_gpio; - /* GPIO sequences for tuner callbacks */ struct em28xx_reg_seq *tuner_gpio; |