From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 13 May 2009 22:32:25 +0000 (+0200)
Subject: Revert "rules: v4l do not mix vbi and video nodes"
X-Git-Tag: 174~1045
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1e5e05730a2554b0bd9fe7ca25b4f7d31907ae97;hp=0c37798916bc87d72f5f1399d9e050307901db84

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 81f9bbd94..8415cd059 100644
--- 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"