On Mon, 2010-02-01 at 12:50 -0200, Mauro Carvalho Chehab wrote:
> As dvb_dmx_swfilter_packet() is protected by a spinlock, it shouldn't sleep.
> However, vmalloc() may call sleep. So, move the initialization of
> dvb_demux::cnt_storage field to a better place.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Looks good. In fact it is slightly better in that it doesn't disable
the global module option for all following demuxes simply for one
vmalloc() failure.
Reviewed-by: Andy Walls <awalls@xxxxxxxxx>
Regards,
Andy
> ---
> drivers/media/dvb/dvb-core/dvb_demux.c | 19 ++++++++-----------
> 1 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
> index a78408e..67f189b 100644
> --- a/drivers/media/dvb/dvb-core/dvb_demux.c
> +++ b/drivers/media/dvb/dvb-core/dvb_demux.c
> @@ -426,16 +426,7 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
> };
> };
>
> - if (dvb_demux_tscheck) {
> - if (!demux->cnt_storage)
> - demux->cnt_storage = vmalloc(MAX_PID + 1);
> -
> - if (!demux->cnt_storage) {
> - printk(KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n");
> - dvb_demux_tscheck = 0;
> - goto no_dvb_demux_tscheck;
> - }
> -
> + if (demux->cnt_storage) {
> /* check pkt counter */
> if (pid < MAX_PID) {
> if (buf[1] & 0x80)
> @@ -454,7 +445,6 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
> };
> /* end check */
> };
> -no_dvb_demux_tscheck:
>
> list_for_each_entry(feed, &demux->feed_list, list_head) {
> if ((feed->pid != pid) && (feed->pid != 0x2000))
> @@ -1258,6 +1248,13 @@ int dvb_dmx_init(struct dvb_demux *dvbdemux)
> dvbdemux->feed[i].index = i;
> }
>
> + if (dvb_demux_tscheck) {
> + dvbdemux->cnt_storage = vmalloc(MAX_PID + 1);
> +
> + if (!dvbdemux->cnt_storage)
> + printk(KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n");
> + }
> +
> INIT_LIST_HEAD(&dvbdemux->frontend_list);
>
> for (i = 0; i < DMX_TS_PES_OTHER; i++) {
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
