Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325837
b: refs/heads/master
c: 2d36684
h: refs/heads/master
i:
  325835: 44befd0
v: v3
  • Loading branch information
Lan Tianyu authored and Greg Kroah-Hartman committed Aug 20, 2012
1 parent 0aa3fea commit 00eb878
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26f944b2716717aa243f16cd2181f80441153f0d
refs/heads/master: 2d366846598d5f562866bba61a836d9325878066
10 changes: 5 additions & 5 deletions trunk/drivers/usb/core/endpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ struct ep_device {
#define to_ep_device(_dev) \
container_of(_dev, struct ep_device, dev)

struct device_type usb_ep_device_type = {
.name = "usb_endpoint",
};

struct ep_attribute {
struct attribute attr;
ssize_t (*show)(struct usb_device *,
Expand Down Expand Up @@ -172,6 +168,11 @@ static void ep_device_release(struct device *dev)
kfree(ep_dev);
}

struct device_type usb_ep_device_type = {
.name = "usb_endpoint",
.release = ep_device_release,
};

int usb_create_ep_devs(struct device *parent,
struct usb_host_endpoint *endpoint,
struct usb_device *udev)
Expand All @@ -190,7 +191,6 @@ int usb_create_ep_devs(struct device *parent,
ep_dev->dev.groups = ep_dev_groups;
ep_dev->dev.type = &usb_ep_device_type;
ep_dev->dev.parent = parent;
ep_dev->dev.release = ep_device_release;
dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress);

retval = device_register(&ep_dev->dev);
Expand Down

0 comments on commit 00eb878

Please sign in to comment.