aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2006-01-15 23:32:53 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 02:24:10 -0500
commita462e9ff524f33da3e504fc71b8dd2b7584e4f28 (patch)
tree6bb8042622121fdf61aad20169e317e743fbec26 /drivers/media
parentea13dbc89caecd982500894d4238766a6bd3c8f4 (diff)
[PATCH] Fix compile warning in bt8xx module
Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 44fcbe77c8f9..ea27b15007e9 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -893,7 +893,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
893 return 0; 893 return 0;
894} 894}
895 895
896static int dvb_bt8xx_remove(struct bttv_sub_device *sub) 896static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
897{ 897{
898 struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev); 898 struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev);
899 899
@@ -911,8 +911,6 @@ static int dvb_bt8xx_remove(struct bttv_sub_device *sub)
911 dvb_unregister_adapter(&card->dvb_adapter); 911 dvb_unregister_adapter(&card->dvb_adapter);
912 912
913 kfree(card); 913 kfree(card);
914
915 return 0;
916} 914}
917 915
918static struct bttv_sub_driver driver = { 916static struct bttv_sub_driver driver = {