diff options
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/bt878.h | 7 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/vivi.c | 5 | ||||
| -rw-r--r-- | v4l/Makefile | 5 | ||||
| -rwxr-xr-x | v4l2-apps/util/gen_keytables.pl | 4 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/general-tab.cpp | 2 |
6 files changed, 19 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/bt878.h b/linux/drivers/media/dvb/bt8xx/bt878.h index af93f78ee..0a60aaf1c 100644 --- a/linux/drivers/media/dvb/bt8xx/bt878.h +++ b/linux/drivers/media/dvb/bt8xx/bt878.h @@ -156,11 +156,10 @@ void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin, void bt878_stop(struct bt878 *bt); #if defined(__powerpc__) /* big-endian */ -extern __inline__ void io_st_le32(volatile unsigned __iomem *addr, unsigned val) +static inline void io_st_le32(volatile unsigned __iomem *addr, unsigned val) { - __asm__ __volatile__("stwbrx %1,0,%2":"=m"(*addr):"r"(val), - "r"(addr)); - __asm__ __volatile__("eieio":::"memory"); + st_le32(addr, val); + eieio(); } #define bmtwrite(dat,adr) io_st_le32((adr),(dat)) diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 21ca7809d..ed4ace009 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -1874,6 +1874,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, if (dev->alt_max_pkt_size == NULL) { em28xx_errdev("out of memory!\n"); em28xx_devused&=~(1<<nr); + kfree(dev); return -ENOMEM; } diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index 19153e452..e0504babe 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -1378,8 +1378,13 @@ vivi_read(struct file *file, char __user *data, size_t count, loff_t *ppos) if (fh->type==V4L2_BUF_TYPE_VIDEO_CAPTURE) { if (res_locked(fh->dev)) return -EBUSY; +#if 0 return videobuf_read_one(&fh->vb_vidq, data, count, ppos, file->f_flags & O_NONBLOCK); +#else + return videobuf_read_stream(&fh->vb_vidq, data, count, ppos, 0, + file->f_flags & O_NONBLOCK); +#endif } return 0; } diff --git a/v4l/Makefile b/v4l/Makefile index 954d5227e..325c01ca9 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -404,3 +404,8 @@ snapshot snap tarball:: update distclean (cd ..; tar czf $(snapdir)/$(snap)-$(date).tar.gz .) hg history --style scripts/map-changelog > /$(snapdir)/$(snap)-ChangeLog-$(date) $(MAKE) -C $(snapdir) + +init: + make -C $(KDIR) init + +$(KDIR)/include/linux/autoconf.h: init diff --git a/v4l2-apps/util/gen_keytables.pl b/v4l2-apps/util/gen_keytables.pl index f183ab4d1..889516de4 100755 --- a/v4l2-apps/util/gen_keytables.pl +++ b/v4l2-apps/util/gen_keytables.pl @@ -2,13 +2,15 @@ use strict; my $keyname=""; +my $debug=0; + while (<>) { #IR_KEYTAB_TYPE ir_codes_proteus_2309[IR_KEYTAB_SIZE] = { if (m/IR_KEYTAB_TYPE\s+(\w[\w\d_]+)/) { $keyname = $1; $keyname =~ s/^ir_codes_//; - print "Generating keycodes/$keyname\n"; + print "Generating keycodes/$keyname\n" if $debug; open OUT, ">keycodes/$keyname"; next; } diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp index 87a0f520d..93ab329ba 100644 --- a/v4l2-apps/util/qv4l2/general-tab.cpp +++ b/v4l2-apps/util/qv4l2/general-tab.cpp @@ -41,6 +41,8 @@ GeneralTab::GeneralTab(int _fd, int n, QWidget *parent) : memset(&tuner, 0, sizeof(tuner)); ioctl(fd, VIDIOC_G_TUNER, &tuner); + if (tuner.rangehigh>INT_MAX) + tuner.rangehigh=INT_MAX; struct v4l2_input vin; memset(&vin, 0, sizeof(vin)); |