diff options
| author | matt mooney | 2011-05-27 10:44:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-06-07 23:26:18 +0200 |
| commit | 35dd0c2da61a584678a4a8425c174c7dbdd36e2b (patch) | |
| tree | f7d1ef40e4bdf182975a99ade5125d5a7c08dfe1 /drivers/staging/usbip/userspace/libsrc/stub_driver.c | |
| parent | staging: usbip: userspace: usbip_list.c: refactor local USB device listing (diff) | |
| download | kernel-qcow2-linux-35dd0c2da61a584678a4a8425c174c7dbdd36e2b.tar.gz kernel-qcow2-linux-35dd0c2da61a584678a4a8425c174c7dbdd36e2b.tar.xz kernel-qcow2-linux-35dd0c2da61a584678a4a8425c174c7dbdd36e2b.zip | |
staging: usbip: userspace: rename usbip device and interface
Add prefix of usbip_ to internal usb device and interface to avoid
confusion with the kernel types. This also identifies the types as
being part of the usbip library.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/usbip/userspace/libsrc/stub_driver.c')
| -rw-r--r-- | drivers/staging/usbip/userspace/libsrc/stub_driver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/stub_driver.c b/drivers/staging/usbip/userspace/libsrc/stub_driver.c index 03556040107a..4d4d17122ce9 100644 --- a/drivers/staging/usbip/userspace/libsrc/stub_driver.c +++ b/drivers/staging/usbip/userspace/libsrc/stub_driver.c @@ -43,7 +43,7 @@ static struct sysfs_driver *open_sysfs_stub_driver(void) #define SYSFS_OPEN_RETRIES 100 /* only the first interface value is true! */ -static int32_t read_attr_usbip_status(struct usb_device *udev) +static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) { char attrpath[SYSFS_PATH_MAX]; struct sysfs_attribute *attr; @@ -145,7 +145,8 @@ static struct usbip_exported_device *usbip_exported_device_new(char *sdevpath) goto err; /* reallocate buffer to include usb interface data */ - size_t size = sizeof(*edev) + edev->udev.bNumInterfaces * sizeof(struct usb_interface); + size_t size = sizeof(*edev) + edev->udev.bNumInterfaces * + sizeof(struct usbip_usb_interface); edev = (struct usbip_exported_device *) realloc(edev, size); if (!edev) { err("alloc device"); |