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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20131218165337.b4ed157d1c013d1eaaf2c218@canb.auug.org.au>
Date:	Wed, 18 Dec 2013 16:53:37 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Boris BREZILLON <b.brezillon@...rkiz.com>,
	Peter Chen <peter.chen@...escale.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ohci-at91.c between commit fb5f1834c322 ("usb:
ohci-at91: fix irq and iomem resource retrieval") from the usb.current
tree and commit 3c9740a117d4 ("usb: hcd: move controller wakeup setting
initialization to individual driver") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/usb/host/ohci-at91.c
index 8c356af79409,29d2093e3cee..000000000000
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@@ -203,9 -199,11 +203,11 @@@ static int usb_hcd_at91_probe(const str
  	ohci->num_ports = board->ports;
  	at91_start_hc(pdev);
  
 -	retval = usb_add_hcd(hcd, pdev->resource[1].start, IRQF_SHARED);
 +	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
- 	if (retval == 0)
+ 	if (retval == 0) {
+ 		device_wakeup_enable(hcd->self.controller);
  		return retval;
+ 	}
  
  	/* Error handling */
  	at91_stop_hc(pdev);

Content of type "application/pgp-signature" skipped