diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/usb/core/message.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/usb/core/message.c')
-rw-r--r-- | drivers/usb/core/message.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index da718e84d58d..e80f1af438c8 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c | |||
@@ -1890,7 +1890,7 @@ static void cancel_async_set_config(struct usb_device *udev) | |||
1890 | * routine gets around the normal restrictions by using a work thread to | 1890 | * routine gets around the normal restrictions by using a work thread to |
1891 | * submit the change-config request. | 1891 | * submit the change-config request. |
1892 | * | 1892 | * |
1893 | * Returns 0 if the request was succesfully queued, error code otherwise. | 1893 | * Returns 0 if the request was successfully queued, error code otherwise. |
1894 | * The caller has no way to know whether the queued request will eventually | 1894 | * The caller has no way to know whether the queued request will eventually |
1895 | * succeed. | 1895 | * succeed. |
1896 | */ | 1896 | */ |