diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-17 01:39:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 01:39:40 +0900 |
| commit | 8c7dd49ad1c936bfff8f976f61cfcb7037c48103 (patch) | |
| tree | 951c2d9221c7e71f2453da849a7d1af9eea7428b /src/udev/udev-builtin-input_id.c | |
| parent | a5a4d5a18e6270b3623dc5c48f1c61344f1d0555 (diff) | |
| parent | 40b6b448bda5294582e685091123952fbcd43502 (diff) | |
| download | systemd-8c7dd49ad1c936bfff8f976f61cfcb7037c48103.tar.gz | |
Merge pull request #27655 from yuwata/udev-net-assign-alternative-names-only-on-add-event
udev/net: assign alternative names only on add event
Diffstat (limited to 'src/udev/udev-builtin-input_id.c')
| -rw-r--r-- | src/udev/udev-builtin-input_id.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index 540f390530..295e8d2159 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -369,8 +369,8 @@ static bool test_key(sd_device *dev, return found; } -static int builtin_input_id(sd_device *dev, sd_netlink **rtnl, int argc, char *argv[], bool test) { - sd_device *pdev; +static int builtin_input_id(UdevEvent *event, int argc, char *argv[], bool test) { + sd_device *pdev, *dev = ASSERT_PTR(ASSERT_PTR(event)->dev); unsigned long bitmask_ev[NBITS(EV_MAX)]; unsigned long bitmask_abs[NBITS(ABS_MAX)]; unsigned long bitmask_key[NBITS(KEY_MAX)]; @@ -380,8 +380,6 @@ static int builtin_input_id(sd_device *dev, sd_netlink **rtnl, int argc, char *a bool is_pointer; bool is_key; - assert(dev); - /* walk up the parental chain until we find the real input device; the * argument is very likely a subdevice of this, like eventN */ for (pdev = dev; pdev; ) { |