From 336abd8993cd97022561da89d058adaa159da871 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 31 Aug 2008 17:39:58 -0300 Subject: [PATCH] --- yaml --- r: 138004 b: refs/heads/master c: 05860f2d966c7d43aebde26eec7f9b8dee6d1523 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/siano/sms-cards.c | 17 +++++++++++++++++ trunk/drivers/media/dvb/siano/sms-cards.h | 2 ++ trunk/drivers/media/dvb/siano/smsusb.c | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7ddbfff1a725..4db70084bc35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9391f4160a62f8c44bee6b93dab33cf329857c7 +refs/heads/master: 05860f2d966c7d43aebde26eec7f9b8dee6d1523 diff --git a/trunk/drivers/media/dvb/siano/sms-cards.c b/trunk/drivers/media/dvb/siano/sms-cards.c index 4fa86f5b7fc5..44df81a81506 100644 --- a/trunk/drivers/media/dvb/siano/sms-cards.c +++ b/trunk/drivers/media/dvb/siano/sms-cards.c @@ -204,3 +204,20 @@ int sms_board_lna_control(struct smscore_device_t *coredev, int onoff) return -EINVAL; } EXPORT_SYMBOL(sms_board_lna_control); + +int sms_board_load_modules(int id) +{ + switch (id) { + case SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT: + case SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A: + case SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B: + case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: + request_module("smsdvb"); + break; + default: + /* do nothing */ + break; + } + return 0; +} +EXPORT_SYMBOL(sms_board_load_modules); diff --git a/trunk/drivers/media/dvb/siano/sms-cards.h b/trunk/drivers/media/dvb/siano/sms-cards.h index 8f539a2e5b9a..64d74c59c33f 100644 --- a/trunk/drivers/media/dvb/siano/sms-cards.h +++ b/trunk/drivers/media/dvb/siano/sms-cards.h @@ -54,4 +54,6 @@ int sms_board_led_feedback(struct smscore_device_t *coredev, int led); int sms_board_power(struct smscore_device_t *coredev, int onoff); int sms_board_lna_control(struct smscore_device_t *coredev, int onoff); +extern int sms_board_load_modules(int id); + #endif /* __SMS_CARDS_H__ */ diff --git a/trunk/drivers/media/dvb/siano/smsusb.c b/trunk/drivers/media/dvb/siano/smsusb.c index 5866b6028dec..5bb8261721b1 100644 --- a/trunk/drivers/media/dvb/siano/smsusb.c +++ b/trunk/drivers/media/dvb/siano/smsusb.c @@ -424,6 +424,7 @@ static int smsusb_probe(struct usb_interface *intf, rc = smsusb_init_device(intf, id->driver_info); sms_info("rc %d", rc); + sms_board_load_modules(id->driver_info); return rc; }