diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-05-05 16:54:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-05 16:54:33 +0200 |
| commit | 59991da498122f779434c4e0beac8a69e0322938 (patch) | |
| tree | 23e46bc7f355c6d65f3246f756cd8ef84cfc3030 /drivers/usb/usb-common.c | |
| parent | ALSA: fm801: introduce fm801_ac97_is_ready()/fm801_ac97_is_valid() helpers (diff) | |
| parent | ALSA: hda - hdmi: Set converter channel count even without sink (diff) | |
| download | linux-59991da498122f779434c4e0beac8a69e0322938.tar.xz linux-59991da498122f779434c4e0beac8a69e0322938.zip | |
Merge branch 'for-linus' into for-next
... for applying the further HDMI fixes.
Diffstat (limited to 'drivers/usb/usb-common.c')
| -rw-r--r-- | drivers/usb/usb-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/usb-common.c b/drivers/usb/usb-common.c index d771870a819e..6dfd30a863c7 100644 --- a/drivers/usb/usb-common.c +++ b/drivers/usb/usb-common.c @@ -69,7 +69,7 @@ const char *usb_state_string(enum usb_device_state state) [USB_STATE_RECONNECTING] = "reconnecting", [USB_STATE_UNAUTHENTICATED] = "unauthenticated", [USB_STATE_DEFAULT] = "default", - [USB_STATE_ADDRESS] = "addresssed", + [USB_STATE_ADDRESS] = "addressed", [USB_STATE_CONFIGURED] = "configured", [USB_STATE_SUSPENDED] = "suspended", }; |