3 files changed, 16 insertions, 3 deletions

diff --git a/drivers/staging/media/as102/as102_drv.h b/drivers/staging/media/as102/as102_drv.h
index 957f0ed0d81..b0e5a23bd53 100644
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -76,7 +76,7 @@ struct as102_dev_t {
         struct as10x_bus_adapter_t bus_adap;
         struct list_head device_entry;
         struct kref kref;
-        unsigned long minor;
+        uint8_t elna_cfg;
 
         struct dvb_adapter dvb_adap;
         struct dvb_frontend dvb_fe;
diff --git a/drivers/staging/media/as102/as102_fe.c b/drivers/staging/media/as102/as102_fe.c
index bdc5a38cddf..043c520183d 100644
--- a/drivers/staging/media/as102/as102_fe.c
+++ b/drivers/staging/media/as102/as102_fe.c
@@ -265,7 +265,7 @@ static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
 
         if (acquire) {
                 if (elna_enable)
-                        as10x_cmd_set_context(&dev->bus_adap, 1010, 0xC0);
+                        as10x_cmd_set_context(&dev->bus_adap, CONTEXT_LNA, dev->elna_cfg);
 
                 ret = as10x_cmd_turn_on(&dev->bus_adap);
         } else {
diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c
index 8d2c84c36a5..0f6bfe7eccb 100644
--- a/drivers/staging/media/as102/as102_usb_drv.c
+++ b/drivers/staging/media/as102/as102_usb_drv.c
@@ -57,6 +57,17 @@ static const char * const as102_device_names[] = {
         NULL /* Terminating entry */
 };
 
+/* eLNA configuration: devices built on the reference design work best
+   with 0xA0, while custom designs seem to require 0xC0 */
+static uint8_t const as102_elna_cfg[] = {
+        0xA0,
+        0xC0,
+        0xC0,
+        0xA0,
+        0xA0,
+        0x00 /* Terminating entry */
+};
+
 struct usb_driver as102_usb_driver = {
         .name           = DRIVER_FULL_NAME,
         .probe          = as102_usb_probe,
@@ -371,8 +382,10 @@ static int as102_usb_probe(struct usb_interface *intf,
         /* Assign the user-friendly device name */
         for (i = 0; i < (sizeof(as102_usb_id_table) /
                          sizeof(struct usb_device_id)); i++) {
-                if (id == &as102_usb_id_table[i])
+                if (id == &as102_usb_id_table[i]) {
                         as102_dev->name = as102_device_names[i];
+                        as102_dev->elna_cfg = as102_elna_cfg[i];
+                }
         }
 
         if (as102_dev->name == NULL)