From f68ba5439f8cfe527f2f7ae205294839aba98b68 Mon Sep 17 00:00:00 2001
From: Peter Chen <peter.chen@freescale.com>
Date: Wed, 5 Jan 2011 14:50:54 +0800
Subject: [PATCH] --- yaml --- r: 232627 b: refs/heads/master c:
 956227120f2e8eed8ca459879d7eafee78591cc1 h: refs/heads/master i:   232625:
 d458af9d421830e60648e1dcc68a56494af01263   232623:
 0a7872dfb2d208b49416a7097b61b082a0409e61 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/core/endpoint.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a3850832af9..365b191996ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20831ad23978d0543b0b23128621b6d8ee7757f1
+refs/heads/master: 956227120f2e8eed8ca459879d7eafee78591cc1
diff --git a/trunk/drivers/usb/core/endpoint.c b/trunk/drivers/usb/core/endpoint.c
index 9da250563027..df502a98d0df 100644
--- a/trunk/drivers/usb/core/endpoint.c
+++ b/trunk/drivers/usb/core/endpoint.c
@@ -192,12 +192,12 @@ int usb_create_ep_devs(struct device *parent,
 	ep_dev->dev.parent = parent;
 	ep_dev->dev.release = ep_device_release;
 	dev_set_name(&ep_dev->dev, "ep_%02x", endpoint->desc.bEndpointAddress);
-	device_enable_async_suspend(&ep_dev->dev);
 
 	retval = device_register(&ep_dev->dev);
 	if (retval)
 		goto error_register;
 
+	device_enable_async_suspend(&ep_dev->dev);
 	endpoint->ep_dev = ep_dev;
 	return retval;