Skip to content

Commit

Permalink
Merge tag 'usb-ci-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/peter.chen/usb into usb-work

Peter writes:

USB Chipidea update for v4.2-rc1

Just a minor change for code style
  • Loading branch information
Greg Kroah-Hartman committed Jun 11, 2015
2 parents fc6b68b + aa90e99 commit df0c6ea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/chipidea/usbmisc_imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit df0c6ea

Please sign in to comment.