merge: from mchehab

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

6 files changed, 35 insertions, 32 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/Makefile b/linux/drivers/media/dvb/dvb-core/Makefile
index 11054657f..0b5182835 100644
--- a/linux/drivers/media/dvb/dvb-core/Makefile
+++ b/linux/drivers/media/dvb/dvb-core/Makefile
@@ -2,8 +2,8 @@
 # Makefile for the kernel DVB device drivers.
 #
 
-dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o 	\
-		dvb_ca_en50221.o dvb_frontend.o 		\
-		dvb_net.o dvb_ringbuffer.o dvb_math.o
+dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o 	\
+		 dvb_ca_en50221.o dvb_frontend.o 		\
+		 dvb_net.o dvb_ringbuffer.o dvb_math.o
 
 obj-$(CONFIG_DVB_CORE) += dvb-core.o
diff --git a/linux/drivers/media/video/pwc/Kconfig b/linux/drivers/media/video/pwc/Kconfig
index 697145e0b..8fdf7101d 100644
--- a/linux/drivers/media/video/pwc/Kconfig
+++ b/linux/drivers/media/video/pwc/Kconfig
@@ -30,7 +30,7 @@ config USB_PWC
 
 config USB_PWC_DEBUG
 	bool "USB Philips Cameras verbose debug"
-	depends USB_PWC
+	depends on USB_PWC
 	help
 	  Say Y here in order to have the pwc driver generate verbose debugging
 	  messages.
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index 1feaf5f0b..8c0e25fde 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -228,6 +228,7 @@ static void konicawc_adjust_picture(struct uvd *uvd)
 static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev)
 {
 	struct input_dev *input_dev;
+	int error;
 
 	usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
 	strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
@@ -248,7 +249,13 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
 
 	input_dev->private = cam;
 
-	input_register_device(cam->input);
+	error = input_register_device(cam->input);
+	if (error) {
+		warn("Failed to register camera's input device, err: %d\n",
+		     error);
+		input_free_device(cam->input);
+		cam->input = NULL;
+	}
 }
 
 static void konicawc_unregister_input(struct konicawc *cam)
diff --git a/v4l/Makefile b/v4l/Makefile
index 63d3fe48a..3e9336a95 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -33,7 +33,7 @@ endif
 default:: config-compat.h Makefile.media links .version
 	echo srcdir $(SRCDIR)
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
-
+	./scripts/rmmod.pl check
 #################################################
 # Object specific rules
 
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index b65037edf..9b2a1600f 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -26,10 +26,6 @@ sub process_config ($)
 
 	open $in,"$kernel/include/$filename" or die "File not found: $kernel/include/$filename";
 	while (<$in>) {
-		if (m|\#include\s+\<(.*)\>|) {
-			process_config ($1);
-			next;
-		}
 		if (m/\#define\s+CONFIG_([^ ]*)_ON_SMP\s+(.*)\n/) {
 			my $key=$1;
 			my $value=$2;
@@ -229,10 +225,10 @@ sub open_kconfig($$) {
 			open_kconfig($dir,"$dir/$1");
 			next;
 		}
-		if (m|^\s+depends on\s+(.*)\n|) {
+		if (m|^\s+depends on\s+(.+?)\s*$|) {
 			check_deps ($key,$1);
 		}
-		if (m|^\s+select\s+(.*)\n|) {
+		if (m|^\s+select\s+(.+?)\s*(if .*?)?\s*$|) {
 			check_deps ($key,$1);
 		}
 		if (m|^\s+bool(ean)?\s|) {
@@ -333,7 +329,7 @@ sub cmp_ver($$)
 	return $v1_sublevel <=> $v2_sublevel;
 }
 
-process_config("linux/config.h");
+process_config("linux/autoconf.h");
 
 parse_versions;
 
@@ -398,13 +394,14 @@ close OUT;
 # These options should default to off
 disable_config('DVB_AV7110_FIRMWARE');
 disable_config('DVB_CINERGYT2_TUNING');
+disable_config('DVB_FE_CUSTOMISE');
 
 # Hack for check sound/oss/aci.h header
 
 my $mirodep="$kernel/sound/oss/aci.h";
-if (!open IN, $mirodep) {
+if (! -e $mirodep) {
 	my $key="RADIO_MIROPCM20";
-print <<"EOF2";
+	print <<"EOF2";
 $key: $mirodep is missing.
 
 ***WARNING:*** You do not have the full kernel sources installed.
@@ -427,7 +424,6 @@ Please see your distro's web site for instructions to build a new kernel.
 EOF2
 	$kernopts{$key}='n';
 }
-close IN;
 
 # Recursively check for broken dependencies
 my $i;
diff --git a/v4l/scripts/rmmod.pl b/v4l/scripts/rmmod.pl
index 19a0a8c61..ade231707 100755
--- a/v4l/scripts/rmmod.pl
+++ b/v4l/scripts/rmmod.pl
@@ -173,22 +173,22 @@ if ($mode eq "load") {
 		prepare_cmd;
 		parse_loaded;
 		rmmod;
+	} elsif ($mode eq "reload") {
+		prepare_cmd;
+		parse_loaded;
+		my @modlist2=@modlist;
+		rmmod;
+		@modlist=@modlist2;
+		insmod(0);
+	} elsif ($mode eq "debug") {
+		prepare_cmd;
+		parse_loaded;
+		insmod(1);
+	} elsif ($mode eq "check") {
+		prepare_cmd;
+		parse_loaded;
 	} else {
-		if ($mode eq "reload") {
-			prepare_cmd;
-			parse_loaded;
-			my @modlist2=@modlist;
-			rmmod;
-			@modlist=@modlist2;
-			insmod(0);
-		} else {
-			if ($mode eq "debug") {
-				prepare_cmd;
-				parse_loaded;
-				insmod(1);
-			} else {
-				printf "Usage: $0 [load|unload|reload]\n";
-			}
-		}
+		printf "Usage: $0 [load|unload|reload|debug|check]\n";
 	}
 }
+