diff options
| author |   Michael Krufky <mkrufky@linuxtv.org> | 2007-12-21 16:12:09 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:04:14 -0200 |
| commit | 7972f9880c8c812332a56da7cfa4523d01ea310b (patch) | |
| tree | 89a21740f33723c103357c66e34e039b1cd84d85 /drivers/media/video/tuner-xc2028.h | |
| parent | V4L/DVB (6892): xc5000: fix build when DVB_TUNER_XC5000 is disabled (diff) | |
| download | linux-dev-7972f9880c8c812332a56da7cfa4523d01ea310b.tar.xz linux-dev-7972f9880c8c812332a56da7cfa4523d01ea310b.zip | |
V4L/DVB (6893): tuner-xc2028: fix xc2028_attach function
xc2028_attach was returning an integer when disabled from the build, where it
should instead be returning NULL. Declare xc2028_attach as type dvb_frontend *
instead of void *.
The prototype declaration must be marked as extern in the header.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/video/tuner-xc2028.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h index 7462629b98fd..3eb8420379a4 100644 --- a/drivers/media/video/tuner-xc2028.h +++ b/drivers/media/video/tuner-xc2028.h @@ -48,14 +48,15 @@ struct xc2028_config { #define XC2028_RESET_CLK 1 #if defined(CONFIG_TUNER_XC2028) || (defined(CONFIG_TUNER_XC2028_MODULE) && defined(MODULE)) -void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg); +extern struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe, + struct xc2028_config *cfg); #else -void *xc2028_attach(struct dvb_frontend *fe, - struct xc2028_config *cfg) +static inline struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe, + struct xc2028_config *cfg) { printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", __FUNCTION__); - return -EINVAL; + return NULL; } #endif |