diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-28 15:27:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-28 15:27:45 -0300 |
| commit | 6bf77e770ed9aaba385261c18ec5c8f16a160e20 (patch) | |
| tree | e5376cf1e1c8a9c07221f424e05dc22609427c91 /linux/drivers/media/dvb | |
| parent | c265cca51af88f5caff789df5ead7de8662ccc0f (diff) | |
| parent | 1719eff8a6f088e48ed02067ff1a00577f53d1aa (diff) | |
| download | mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.gz mediapointer-dvb-s2-6bf77e770ed9aaba385261c18ec5c8f16a160e20.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/tda9887
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index f3fde4545..631120de7 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -569,7 +569,7 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct poll_wait(file, &cinergyt2->poll_wq, wait); if (cinergyt2->pending_fe_events != 0) - mask |= (POLLIN | POLLRDNORM | POLLPRI); + mask |= (POLLIN | POLLRDNORM | POLLPRI); mutex_unlock(&cinergyt2->sem); diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index a1989e336..eb666e1e0 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -1137,7 +1137,11 @@ static void wq_set_multicast_list (void *data) dvb_net_feed_stop(dev); priv->rx_mode = RX_MODE_UNI; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) spin_lock_bh(&dev->xmit_lock); +#else + netif_tx_lock_bh(dev); +#endif if (dev->flags & IFF_PROMISC) { dprintk("%s: promiscuous mode\n", dev->name); @@ -1162,7 +1166,11 @@ static void wq_set_multicast_list (void *data) } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) spin_unlock_bh(&dev->xmit_lock); +#else + netif_tx_unlock_bh(dev); +#endif dvb_net_feed_start(dev); } |