diff --git a/[refs] b/[refs] index 216e0a4d5d1e..29aed3a0f8b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4d82fbb458e6c6eebcff84653563c9c5e9a530d +refs/heads/master: feffce47678375a6422d5356a379e407f007d424 diff --git a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c index 16cf53e38a74..06bd793c52b5 100644 --- a/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/trunk/drivers/staging/vme/bridges/vme_ca91cx42.c @@ -963,11 +963,11 @@ int ca91cx42_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src, if (dest->type == VME_DMA_VME) { entry->descriptor.dctl |= CA91CX42_DCTL_L2V; - vme_attr = (struct vme_dma_vme *)dest->private; - pci_attr = (struct vme_dma_pci *)src->private; + vme_attr = dest->private; + pci_attr = src->private; } else { - vme_attr = (struct vme_dma_vme *)src->private; - pci_attr = (struct vme_dma_pci *)dest->private; + vme_attr = src->private; + pci_attr = dest->private; } /* Check we can do fullfill required attributes */