Changeset 7aaed09 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/drv/generic/driver.c (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -288 +288 @@
         (void) parent_fun_handle;
         
-        res = driver->driver_ops->add_device(dev);
+        res = driver->driver_ops->dev_add(dev);
         
         if (res != EOK) {