From 4bf4fe7960ba0df383a5a6346ebeb9c04817a7ba Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 21 Dec 2007 14:12:09 -0500 Subject: tuner-xc2028: fix xc2028_attach function From: Michael Krufky 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 --- linux/drivers/media/video/tuner-xc2028.c | 3 ++- linux/drivers/media/video/tuner-xc2028.h | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/tuner-xc2028.c b/linux/drivers/media/video/tuner-xc2028.c index 1e57fe744..14880533c 100644 --- a/linux/drivers/media/video/tuner-xc2028.c +++ b/linux/drivers/media/video/tuner-xc2028.c @@ -1159,7 +1159,8 @@ static const struct dvb_tuner_ops xc2028_dvb_tuner_ops = { #endif }; -void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg) +struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe, + struct xc2028_config *cfg) { struct xc2028_data *priv; void *video_dev; diff --git a/linux/drivers/media/video/tuner-xc2028.h b/linux/drivers/media/video/tuner-xc2028.h index 7462629b9..3eb842037 100644 --- a/linux/drivers/media/video/tuner-xc2028.h +++ b/linux/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 -- cgit v1.2.3