Changeset beb9336 in mainline for uspace/drv/bus/usb/vhc/conndev.c

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

File:

• uspace/drv/bus/usb/vhc/conndev.c (modified) (2 diffs)

uspace/drv/bus/usb/vhc/conndev.c

@@ -94 +94 @@
     ipc_call_t *icall)
 {
-        vhc_data_t *vhc = fun->dev->driver_data;
+        vhc_data_t *vhc = ddf_dev_data_get(ddf_fun_get_dev(fun));
         
         async_sess_t *callback =
@@ -125 +125 @@
 void on_client_close(ddf_fun_t *fun)
 {
-        vhc_data_t *vhc = fun->dev->driver_data;
+        vhc_data_t *vhc = ddf_dev_data_get(ddf_fun_get_dev(fun));
 
         if (plugged_device_handle != 0) {