|
@@ -242,16 +242,14 @@ static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed)
|
|
|
if (!demux->dmx.frontend)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (dvb) {
|
|
|
- mutex_lock(&dvb->lock);
|
|
|
- if (dvb->feeding++ == 0) {
|
|
|
- /* Start transport */
|
|
|
- ret = saa7164_dvb_start_port(port);
|
|
|
- }
|
|
|
- mutex_unlock(&dvb->lock);
|
|
|
- dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
|
|
|
- __func__, port->nr, dvb->feeding);
|
|
|
+ mutex_lock(&dvb->lock);
|
|
|
+ if (dvb->feeding++ == 0) {
|
|
|
+ /* Start transport */
|
|
|
+ ret = saa7164_dvb_start_port(port);
|
|
|
}
|
|
|
+ mutex_unlock(&dvb->lock);
|
|
|
+ dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
|
|
|
+ __func__, port->nr, dvb->feeding);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -266,16 +264,14 @@ static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed)
|
|
|
|
|
|
dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);
|
|
|
|
|
|
- if (dvb) {
|
|
|
- mutex_lock(&dvb->lock);
|
|
|
- if (--dvb->feeding == 0) {
|
|
|
- /* Stop transport */
|
|
|
- ret = saa7164_dvb_stop_streaming(port);
|
|
|
- }
|
|
|
- mutex_unlock(&dvb->lock);
|
|
|
- dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
|
|
|
- __func__, port->nr, dvb->feeding);
|
|
|
+ mutex_lock(&dvb->lock);
|
|
|
+ if (--dvb->feeding == 0) {
|
|
|
+ /* Stop transport */
|
|
|
+ ret = saa7164_dvb_stop_streaming(port);
|
|
|
}
|
|
|
+ mutex_unlock(&dvb->lock);
|
|
|
+ dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",
|
|
|
+ __func__, port->nr, dvb->feeding);
|
|
|
|
|
|
return ret;
|
|
|
}
|