Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[karo-tx-linux.git] / fs / sysfs / file.c

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 602f56db0442bea394d77b208aea303ccbe6f026..d2bb7ed8fa74e772e8de3f112fdc16854ee6527d 100644 (file)
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -449,10 +449,12 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
 
        spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
 
-       od = sd->s_attr.open;
-       if (od) {
-               atomic_inc(&od->event);
-               wake_up_interruptible(&od->poll);
+       if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
+               od = sd->s_attr.open;
+               if (od) {
+                       atomic_inc(&od->event);
+                       wake_up_interruptible(&od->poll);
+               }
        }
 
        spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);