summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorHolger Waechtler <devnull@localhost>2003-04-29 15:21:27 +0000
committerHolger Waechtler <devnull@localhost>2003-04-29 15:21:27 +0000
commit430ef42da0be51755f567de0d5063915b6a74054 (patch)
tree530a99faed52f1d11ba3de36ff5ab7fc5a6f6529 /linux
parent68d6df188770816736b28d6b65c8ee8ba0eaeb24 (diff)
downloadmediapointer-dvb-s2-430ef42da0be51755f567de0d5063915b6a74054.tar.gz
mediapointer-dvb-s2-430ef42da0be51755f567de0d5063915b6a74054.tar.bz2
- portability fixes, follow compat.[hc] -> dvb_compat.[hc] changes
- replace -ENOSPC by -EBUSY in demux feed allocation
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_demux.c2
-rw-r--r--linux/drivers/media/dvb/frontends/stv0299.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
index 10243ad5a..f7ff477fd 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -753,7 +753,7 @@ dmx_section_feed_allocate_filter(struct dmx_section_feed_s* feed,
dvbdmxfilter = dvb_dmx_filter_alloc(dvbdemux);
if (!dvbdmxfilter) {
up(&dvbdemux->mutex);
- return -ENOSPC;
+ return -EBUSY;
}
spin_lock_irq(&dvbdemux->lock);
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index 4d5b11fac..936dbb91b 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -37,6 +37,7 @@
#include <asm/errno.h>
#include <linux/init.h>
+#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/string.h>