Revert "rules: v4l do not mix vbi and video nodes"

This reverts commit 6205f1186e4980544ea425d31770358d1b2579e4.

diff --git a/rules/rules.d/60-persistent-v4l.rules b/rules/rules.d/60-persistent-v4l.rules
index 81f9bbd94daa5cdc6ad4366ba95308ddef04b5fe..8415cd059b22f31730f466c1e2507b5aff8764a1 100644 (file)
--- a/rules/rules.d/60-persistent-v4l.rules
+++ b/rules/rules.d/60-persistent-v4l.rules
@@ -11,8 +11,7 @@ TEST!="index", GOTO="persistent_v4l_end"
 ATTR{index}!="?*", GOTO="persistent_v4l_end"
 
 IMPORT{program}="path_id %p"
-ENV{ID_PATH}=="?*", KERNEL=="video*", SYMLINK+="v4l/by-path/$env{ID_PATH}-video-index$attr{index}"
-ENV{ID_PATH}=="?*", KERNEL=="vbi*", SYMLINK+="v4l/by-path/$env{ID_PATH}-vbi-index$attr{index}"
+ENV{ID_PATH}=="?*", KERNEL=="video*|vbi*", SYMLINK+="v4l/by-path/$env{ID_PATH}-video-index$attr{index}"
 ENV{ID_PATH}=="?*", KERNEL=="audio*", SYMLINK+="v4l/by-path/$env{ID_PATH}-audio-index$attr{index}"
 
 LABEL="persistent_v4l_end"