Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285670
b: refs/heads/master
c: 9474c5e
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jan 5, 2012
1 parent 971f34c commit bbdc4ed
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6c4b78cbe64fad1c7a561d22014842f8eafbda47
refs/heads/master: 9474c5e63f61d052ac218b9f7c4c0b3c7c2b083a
13 changes: 9 additions & 4 deletions trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -1551,6 +1551,8 @@ static int set_delivery_system(struct dvb_frontend *fe, u32 desired_system)
}
}
}
dprintk("change delivery system on cache to %d\n", c->delivery_system);

return 0;
}

Expand Down Expand Up @@ -1965,6 +1967,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
switch (cmd) {
case FE_GET_INFO: {
struct dvb_frontend_info* info = parg;

memcpy(info, &fe->ops.info, sizeof(struct dvb_frontend_info));
dvb_frontend_get_frequency_limits(fe, &info->frequency_min, &info->frequency_max);

Expand All @@ -1981,23 +1984,25 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
*/
switch (dvbv3_type(c->delivery_system)) {
case DVBV3_QPSK:
fe->ops.info.type = FE_QPSK;
info->type = FE_QPSK;
break;
case DVBV3_ATSC:
fe->ops.info.type = FE_ATSC;
info->type = FE_ATSC;
break;
case DVBV3_QAM:
fe->ops.info.type = FE_QAM;
info->type = FE_QAM;
break;
case DVBV3_OFDM:
fe->ops.info.type = FE_OFDM;
info->type = FE_OFDM;
break;
default:
printk(KERN_ERR
"%s: doesn't know how to handle a DVBv3 call to delivery system %i\n",
__func__, c->delivery_system);
fe->ops.info.type = FE_OFDM;
}
dprintk("current delivery system on cache: %d, V3 type: %d\n",
c->delivery_system, fe->ops.info.type);

/* Force the CAN_INVERSION_AUTO bit on. If the frontend doesn't
* do it, it is done for it. */
Expand Down

0 comments on commit bbdc4ed

Please sign in to comment.