chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] trivial: remove _all_ trailing slashes with no_trailing_slash()
[elogind.git]
/
udev_remove.c
diff --git
a/udev_remove.c
b/udev_remove.c
index 32cd785984c821267fde164258098ea07b0aa8b9..142503589a6f90a42f0da4cb392cba12f9f75525 100644
(file)
--- a/
udev_remove.c
+++ b/
udev_remove.c
@@
-31,7
+31,7
@@
#include <sys/stat.h>
#include "udev.h"
#include <sys/stat.h>
#include "udev.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "udev_version.h"
#include "namedev.h"
#include "udev_db.h"
#include "udev_version.h"
#include "namedev.h"
#include "udev_db.h"
@@
-185,6
+185,11
@@
int udev_remove_device(struct udevice *udev)
dbg("'%s' not found in database, falling back on default name", udev->name);
}
dbg("'%s' not found in database, falling back on default name", udev->name);
}
+ if (udev->ignore_remove) {
+ dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+ return 0;
+ }
+
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);
dbg("remove name='%s'", udev->name);
udev_db_delete_device(udev);