Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3eb215de26e6e94bf5fed9cb77230c383b30e53b

Authored by Dmitry Torokhov
Committed by Linus Torvalds
1 parent 85923b1246
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Driver core: fix SYSF_DEPRECATED breakage for nested classdevs 

We should only reparent to a class former class devices that
form the base of class hierarchy. Nested devices should still
grow from their real parents.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Tested-by: Andrey Borzenkov <arvidjaar@mail.ru>
Tested-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 7 additions and 3 deletions Side-by-side Diff

... ... @@ -586,9 +586,13 @@
586 586 static struct kobject * get_device_parent(struct device *dev,
587 587 struct device *parent)
588 588 {
589   - /* Set the parent to the class, not the parent device */
590   - /* this keeps sysfs from having a symlink to make old udevs happy */
591   - if (dev->class)
  589 + /*
  590 + * Set the parent to the class, not the parent device
  591 + * for topmost devices in class hierarchy.
  592 + * This keeps sysfs from having a symlink to make old
  593 + * udevs happy
  594 + */
  595 + if (dev->class && (!parent || parent->class != dev->class))
592 596 return &dev->class->subsys.kobj;
593 597 else if (parent)
594 598 return &parent->kobj;