diff options
| author |   Dave Airlie <airlied@redhat.com> | 2010-10-06 11:10:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-06 11:10:48 +1000 |
| commit | fb7ba2114bcd8bb51640c20bc68f89164b29b9ed (patch) | |
| tree | 80b4a779130a477680a72109257fb8c19d66cf22 /drivers/usb/musb/cppi_dma.c | |
| parent | Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next (diff) | |
| parent | vmwgfx: Fix fb VRAM pinning failure due to fragmentation (diff) | |
| download | wireguard-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.tar.xz wireguard-linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.zip | |
Merge remote branch 'korg/drm-fixes' into drm-vmware-next
necessary for some of the vmware fixes to be pushed in.
Conflicts:
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/i915/intel_fb.c
include/drm/drmP.h
Diffstat (limited to 'drivers/usb/musb/cppi_dma.c')
| -rw-r--r-- | drivers/usb/musb/cppi_dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 59dc3d351b60..5ab5bb89bae3 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c @@ -322,6 +322,7 @@ cppi_channel_allocate(struct dma_controller *c, index, transmit ? 'T' : 'R', cppi_ch); cppi_ch->hw_ep = ep; cppi_ch->channel.status = MUSB_DMA_STATUS_FREE; + cppi_ch->channel.max_len = 0x7fffffff; DBG(4, "Allocate CPPI%d %cX\n", index, transmit ? 'T' : 'R'); return &cppi_ch->channel; |