Skip to contentSkip to conversation

Fix compile warning in bt8xx module

PATCH In review Dmitry Torokhov 3 participants 3 messages Jan 16, 2006 – Jan 19, 2006 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix compile warning in bt8xx module

---

 drivers/media/dvb/bt8xx/dvb-bt8xx.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)
drivers/media/dvb/bt8xx/dvb-bt8xx.c +1 -3
Index: work/drivers/media/dvb/bt8xx/dvb-bt8xx.c
===================================================================
@@ -893,7 +893,7 @@ static int dvb_bt8xx_probe(struct bttv_s
 	return 0;
 }
 
-static int dvb_bt8xx_remove(struct bttv_sub_device *sub)
+static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
 {
 	struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev);
 
@@ -911,8 +911,6 @@ static int dvb_bt8xx_remove(struct bttv_
 	dvb_unregister_adapter(&card->dvb_adapter);
 
 	kfree(card);
-
-	return 0;
 }
 
 static struct bttv_sub_driver driver = {
#2 lore raw
Quoted 7 lines · Mauro Carvalho Chehab

Dmitry,

Your patch conflicted with another one by Jean Delaware.

Please next time send dvb or v4l patches to me c/c to
[email protected] and [email protected]

My apologies. The original change did not come from your tree, it was a wholesale tree update, that's why I sent it to patch originator. Next time I will make sure to CC you and V4L/DVB lists.

--
Dmitry