Hi,
On Tue, Mar 19, 2013 at 02:39:22PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/usb/gadget/amd5536udc.c between commit 6c39d90393a2 ("usb:
> gadget: amd5536udc: remove unnecessary initializations") from the tree
Looks like there's a small bug in your scripts: "from the tree" misses
"usb-gadget".
> and commit "drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create()
> with NULL dev" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/usb/gadget/amd5536udc.c
> index f52dcfe,142616a..0000000
> --- a/drivers/usb/gadget/amd5536udc.c
> +++ b/drivers/usb/gadget/amd5536udc.c
> @@@ -3232,6 -3235,12 +3232,10 @@@ static int udc_pci_probe
> pci_set_master(pdev);
> pci_try_set_mwi(pdev);
>
> + dev->phys_addr = resource;
> + dev->irq = pdev->irq;
> + dev->pdev = pdev;
> - dev->gadget.dev.parent = &pdev->dev;
> - dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
> +
fix looks alright, thank you
--
balbi
Attachment:
signature.asc
Description: Digital signature
