diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-11 03:18:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-11 03:18:10 +0200 |
| commit | df0c6ea853e3a865ddd2ab2d5bfd82fc27845736 (patch) | |
| tree | 39c6baf0eaa5164fffa09f15c4e968ddbf5e37e4 /drivers/usb | |
| parent | usb: chipidea: add work-around for Marvell HSIC PHY startup (diff) | |
| parent | usb: chipidea: usbmisc_imx: Remove unneeded semicolon (diff) | |
| download | linux-df0c6ea853e3a865ddd2ab2d5bfd82fc27845736.tar.xz linux-df0c6ea853e3a865ddd2ab2d5bfd82fc27845736.zip | |
Merge tag 'usb-ci-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-work
Peter writes:
USB Chipidea update for v4.2-rc1
Just a minor change for code style
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/chipidea/usbmisc_imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 140945cb124f..3cefd49ddb00 100644 --- a/drivers/usb/chipidea/usbmisc_imx.c +++ b/drivers/usb/chipidea/usbmisc_imx.c @@ -160,7 +160,7 @@ static int usbmisc_imx27_init(struct imx_usbmisc_data *data) break; default: return -EINVAL; - }; + } spin_lock_irqsave(&usbmisc->lock, flags); if (data->disable_oc) |