linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/chipidea/ci_hdrc_imx.c

between commit:

  8cab0e9a3f3e ("usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines")

from the usb.current tree and commit:

  ee0dc2f7d522 ("usb: chipidea: imx: add wakeup interrupt handling")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/chipidea/ci_hdrc_imx.c
index 4f8bfd242b59,c34298ccc399..000000000000
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@@ -336,13 -338,16 +338,23 @@@ static int ci_hdrc_imx_notify_event(str
  	return ret;
  }
  
 +static void ci_hdrc_imx_disable_regulator(void *arg)
 +{
 +	struct ci_hdrc_imx_data *data = arg;
 +
 +	regulator_disable(data->hsic_pad_regulator);
 +}
 +
+ static irqreturn_t ci_wakeup_irq_handler(int irq, void *data)
+ {
+ 	struct ci_hdrc_imx_data *imx_data = data;
+ 
+ 	disable_irq_nosync(irq);
+ 	pm_runtime_resume(&imx_data->ci_pdev->dev);
+ 
+ 	return IRQ_HANDLED;
+ }
+ 
  static int ci_hdrc_imx_probe(struct platform_device *pdev)
  {
  	struct ci_hdrc_imx_data *data;

Attachment: pgpBN3KMLkKHr.pgp
Description: OpenPGP digital signature