fix failure when applying backports/debug.patch
Commit Message
Hi,
backports/debug.patch has gotten out of sync with the main tree.
The last patch hunk fails:
...
Applying patches for kernel 3.13.0-57-generic
patch -s -f -N -p1 -i ../backports/api_version.patch
patch -s -f -N -p1 -i ../backports/pr_fmt.patch
patch -s -f -N -p1 -i ../backports/debug.patch
1 out of 1 hunk FAILED
make[2]: *** [apply_patches] Error 1
make[2]: Leaving directory `/home/vjm/git/clones/media_build/linux'
make[1]: *** [allyesconfig] Error 2
make[1]: Leaving directory `/home/vjm/git/clones/media_build/v4l'
make: *** [allyesconfig] Error 2
can't select all drivers at ./build line 490, <IN> line 4.
This happens because this change removed the #define DEBUG line
commit 890024ad144902bfa637f23b94b396701a88ed88
Author: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Date: Fri Jul 3 16:11:41 2015 -0300
[media] stk1160: Reduce driver verbosity
These messages are not really informational, and just makes the driver's
output too verbose. This commit changes some messages to a debug level,
removes a really useless "driver loaded" message and finally undefines
the DEBUG macro.
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
$ git diff e3e30f63389a319ca45161b07eb74e60f1e7ea20 890024ad144902bfa637f23b94b396701a88ed88 drivers/media/usb/stk1160/stk1160.h
@@ -58,6 +58,7 @@
@@ -43,6 +43,6 @@ index abdea48..2eed017 100644
*
*/
+#undef DEBUG
- #define DEBUG
#ifdef DEBUG
#define stk1160_dbg(fmt, args...) \
+ printk(KERN_DEBUG "stk1160: " fmt, ## args)
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
b/drivers/media/usb/stk1160/stk1160.h
@@ -58,7 +58,6 @@
* new drivers should use.
*
*/
-#define DEBUG
#ifdef DEBUG
#define stk1160_dbg(fmt, args...) \
printk(KERN_DEBUG "stk1160: " fmt, ## args)
The following should fix the issue
@@ -35,7 +35,7 @@ index fb2acc5..8edffcb 100644
#endif
diff --git a/drivers/media/usb/stk1160/stk1160.h
b/drivers/media/usb/stk1160/stk1160.h
-index abdea48..2eed017 100644
+index 72cc8e8..323e5d7 100644
--- a/drivers/media/usb/stk1160/stk1160.h
+++ b/drivers/media/usb/stk1160/stk1160.h