naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
2aacef
From 35ec16bfef92d072edacad892fc138b3595ee69b Mon Sep 17 00:00:00 2001
2aacef
From: Yu Watanabe <watanabe.yu+github@gmail.com>
2aacef
Date: Thu, 3 Nov 2022 09:43:14 +0900
2aacef
Subject: [PATCH] udev: drop redundant call of usb_id and assignment of
2aacef
 ID_USB_INTERFACE_NUM
2aacef
2aacef
The usb_id builtin command is already called in the above, and the
2aacef
command sets the ID_USB_INTERFACE_NUM property.
2aacef
2aacef
(cherry picked from commit b2e53f5a0f12db65c88404477fedee5c57d201ba)
2aacef
2aacef
Related #2138081
2aacef
---
2aacef
 rules.d/60-serial.rules | 2 --
2aacef
 1 file changed, 2 deletions(-)
2aacef
2aacef
diff --git a/rules.d/60-serial.rules b/rules.d/60-serial.rules
2aacef
index c133f26109..2c1488e930 100644
2aacef
--- a/rules.d/60-serial.rules
2aacef
+++ b/rules.d/60-serial.rules
2aacef
@@ -17,9 +17,7 @@ IMPORT{builtin}="path_id"
2aacef
 ENV{ID_PATH}=="?*", ENV{.ID_PORT}=="", SYMLINK+="serial/by-path/$env{ID_PATH}"
2aacef
 ENV{ID_PATH}=="?*", ENV{.ID_PORT}=="?*", SYMLINK+="serial/by-path/$env{ID_PATH}-port$env{.ID_PORT}"
2aacef
 
2aacef
-IMPORT{builtin}="usb_id"
2aacef
 ENV{ID_SERIAL}=="", GOTO="serial_end"
2aacef
-SUBSYSTEMS=="usb", ENV{ID_USB_INTERFACE_NUM}="$attr{bInterfaceNumber}"
2aacef
 ENV{ID_USB_INTERFACE_NUM}=="", GOTO="serial_end"
2aacef
 ENV{.ID_PORT}=="", SYMLINK+="serial/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}"
2aacef
 ENV{.ID_PORT}=="?*", SYMLINK+="serial/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}-port$env{.ID_PORT}"