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

Timestamp:

2011-04-03T11:17:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

106743d

Parents:

10eb754 (diff), b2a081ae (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) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -273 +273 @@
         
         res = driver->driver_ops->add_device(dev);
-        if (res == EOK) {
-                printf("%s: new device with handle=%" PRIun " was added.\n",
-                    driver->name, dev_handle);
-        } else {
-                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
-                    driver->name, dev_handle);
+        if (res != EOK)
                 delete_device(dev);
-        }
         
         async_answer_0(iid, res);
@@ -408 +402 @@
                             get_remote_method(rem_iface, iface_method_idx);
                         if (iface_method_ptr == NULL) {
-                                // the interface has not such method
+                                /* The interface has not such method */
                                 printf("%s: driver_connection_gen error - "
                                     "invalid interface method.", driver->name);