diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:32:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 03:32:12 -0400 |
| commit | f65e77693aa5a1cf688fc378bc6913a56f9ff7b7 (patch) | |
| tree | 5d5b6ee3e3f9da241a583bf49ab648637ac4c1a9 /drivers/base/core.c | |
| parent | 8566cfc9fe0934f52ddedc12b083176116c13978 (diff) | |
| parent | d856f1e337782326c638c70c0b4df2b909350dec (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index efe03a024a5b..c8a33df00761 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -249,7 +249,7 @@ int device_add(struct device *dev) | |||
| 249 | if ((error = bus_add_device(dev))) | 249 | if ((error = bus_add_device(dev))) |
| 250 | goto BusError; | 250 | goto BusError; |
| 251 | if (parent) | 251 | if (parent) |
| 252 | klist_add_tail(&parent->klist_children, &dev->knode_parent); | 252 | klist_add_tail(&dev->knode_parent, &parent->klist_children); |
| 253 | 253 | ||
| 254 | /* notify platform of device entry */ | 254 | /* notify platform of device entry */ |
| 255 | if (platform_notify) | 255 | if (platform_notify) |