aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/firewire/firedtv-avc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-avc.c')
-rw-r--r--drivers/media/dvb/firewire/firedtv-avc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c
index 5516c33b1453..50c42a4b972b 100644
--- a/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/drivers/media/dvb/firewire/firedtv-avc.c
@@ -1236,14 +1236,14 @@ int avc_ca_get_mmi(struct firedtv *fdtv, char *mmi_object, unsigned int *len)
1236 1236
1237#define CMP_OUTPUT_PLUG_CONTROL_REG_0 0xfffff0000904ULL 1237#define CMP_OUTPUT_PLUG_CONTROL_REG_0 0xfffff0000904ULL
1238 1238
1239static int cmp_read(struct firedtv *fdtv, void *buf, u64 addr, size_t len) 1239static int cmp_read(struct firedtv *fdtv, u64 addr, __be32 *data)
1240{ 1240{
1241 int ret; 1241 int ret;
1242 1242
1243 if (mutex_lock_interruptible(&fdtv->avc_mutex)) 1243 if (mutex_lock_interruptible(&fdtv->avc_mutex))
1244 return -EINTR; 1244 return -EINTR;
1245 1245
1246 ret = fdtv->backend->read(fdtv, addr, buf, len); 1246 ret = fdtv->backend->read(fdtv, addr, data);
1247 if (ret < 0) 1247 if (ret < 0)
1248 dev_err(fdtv->device, "CMP: read I/O error\n"); 1248 dev_err(fdtv->device, "CMP: read I/O error\n");
1249 1249
@@ -1293,7 +1293,7 @@ int cmp_establish_pp_connection(struct firedtv *fdtv, int plug, int channel)
1293 int attempts = 0; 1293 int attempts = 0;
1294 int ret; 1294 int ret;
1295 1295
1296 ret = cmp_read(fdtv, opcr, opcr_address, 4); 1296 ret = cmp_read(fdtv, opcr_address, opcr);
1297 if (ret < 0) 1297 if (ret < 0)
1298 return ret; 1298 return ret;
1299 1299
@@ -1357,7 +1357,7 @@ void cmp_break_pp_connection(struct firedtv *fdtv, int plug, int channel)
1357 u64 opcr_address = CMP_OUTPUT_PLUG_CONTROL_REG_0 + (plug << 2); 1357 u64 opcr_address = CMP_OUTPUT_PLUG_CONTROL_REG_0 + (plug << 2);
1358 int attempts = 0; 1358 int attempts = 0;
1359 1359
1360 if (cmp_read(fdtv, opcr, opcr_address, 4) < 0) 1360 if (cmp_read(fdtv, opcr_address, opcr) < 0)
1361 return; 1361 return;
1362 1362
1363repeat: 1363repeat: