aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorAbylay Ospan <aospan@netup.ru>2016-04-01 18:00:53 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-06-07 12:10:58 -0300
commita09afd8fa307429f7514350d08f4a75f96cfae53 (patch)
tree6d2abf89fec5a1d4bfeafb3ddaa60a7d25942684 /drivers/media/pci
parent[media] New hw revision 1.4 of NetUP Universal DVB card added (diff)
downloadlinux-dev-a09afd8fa307429f7514350d08f4a75f96cfae53.tar.xz
linux-dev-a09afd8fa307429f7514350d08f4a75f96cfae53.zip
[media] Fix CAM module memory read/write
mistakenly membase8_io used instead of membase8_config in this case we can't read/write CAM module memory (TUPLES) Signed-off-by: Abylay Ospan <aospan@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/netup_unidvb/netup_unidvb_ci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c b/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
index f46ffac66ee9..f535270c2116 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
@@ -147,7 +147,7 @@ static int netup_unidvb_ci_read_attribute_mem(struct dvb_ca_en50221 *en50221,
{
struct netup_ci_state *state = en50221->data;
struct netup_unidvb_dev *dev = state->dev;
- u8 val = *((u8 __force *)state->membase8_io + addr);
+ u8 val = *((u8 __force *)state->membase8_config + addr);
dev_dbg(&dev->pci_dev->dev,
"%s(): addr=0x%x val=0x%x\n", __func__, addr, val);
@@ -162,7 +162,7 @@ static int netup_unidvb_ci_write_attribute_mem(struct dvb_ca_en50221 *en50221,
dev_dbg(&dev->pci_dev->dev,
"%s(): addr=0x%x data=0x%x\n", __func__, addr, data);
- *((u8 __force *)state->membase8_io + addr) = data;
+ *((u8 __force *)state->membase8_config + addr) = data;
return 0;
}