4 files changed, 10 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/frontends/xc5000.c b/linux/drivers/media/dvb/frontends/xc5000.c
index 464fd3f46..86483bc2a 100644
--- a/linux/drivers/media/dvb/frontends/xc5000.c
+++ b/linux/drivers/media/dvb/frontends/xc5000.c
@@ -557,7 +557,8 @@ static int xc5000_fwupload(struct dvb_frontend* fe)
 		printk(KERN_ERR "xc5000: Upload failed. (file not found?)\n");
 		ret = XC_RESULT_RESET_FAILURE;
 	} else {
-		printk(KERN_INFO "xc5000: firmware read %d bytes.\n", fw->size);
+		printk(KERN_INFO "xc5000: firmware read %Zu bytes.\n",
+		       fw->size);
 		ret = XC_RESULT_SUCCESS;
 	}
 
diff --git a/linux/drivers/media/dvb/frontends/xc5000.h b/linux/drivers/media/dvb/frontends/xc5000.h
index 9286a0382..941b31948 100644
--- a/linux/drivers/media/dvb/frontends/xc5000.h
+++ b/linux/drivers/media/dvb/frontends/xc5000.h
@@ -42,7 +42,7 @@ extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
 #else
 static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
 						 struct i2c_adapter *i2c,
-						 struct xc5000_config *cfg);
+						 struct xc5000_config *cfg)
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
 	return NULL;
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