diff --git a/[refs] b/[refs] index bb65e6a8a345..b44ed9870144 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81347f5a2dda0f4dffdaf5ec7f93f9d6d398ef8c +refs/heads/master: 8acc91cd68e8493ce892c39d9f94afd8bcf9be67 diff --git a/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c index 4d8382a0ee8a..f17e73baccff 100644 --- a/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c @@ -618,14 +618,6 @@ static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d, return ret; } - -static int rtl2832u_fc0013_tuner_callback(struct dvb_usb_device *d, - int cmd, int arg) -{ - /* TODO implement*/ - return 0; -} - static int rtl2832u_tua9001_tuner_callback(struct dvb_usb_device *d, int cmd, int arg) { @@ -676,8 +668,6 @@ static int rtl2832u_tuner_callback(struct dvb_usb_device *d, int cmd, int arg) switch (priv->tuner) { case TUNER_RTL2832_FC0012: return rtl2832u_fc0012_tuner_callback(d, cmd, arg); - case TUNER_RTL2832_FC0013: - return rtl2832u_fc0013_tuner_callback(d, cmd, arg); case TUNER_RTL2832_TUA9001: return rtl2832u_tua9001_tuner_callback(d, cmd, arg); default: @@ -688,11 +678,14 @@ static int rtl2832u_tuner_callback(struct dvb_usb_device *d, int cmd, int arg) } static int rtl2832u_frontend_callback(void *adapter_priv, int component, - int cmd, int arg) + int cmd, int arg) { struct i2c_adapter *adap = adapter_priv; struct dvb_usb_device *d = i2c_get_adapdata(adap); + dev_dbg(&d->udev->dev, "%s: component=%d cmd=%d arg=%d\n", + __func__, component, cmd, arg); + switch (component) { case DVB_FRONTEND_COMPONENT_TUNER: return rtl2832u_tuner_callback(d, cmd, arg);