From 12cffe1ba101f36b2de758aeb1b2241d2d6b61ce Mon Sep 17 00:00:00 2001 From: "Govindraj.R" Date: Wed, 15 Feb 2012 12:27:50 +0530 Subject: [PATCH] --- yaml --- r: 296839 b: refs/heads/master c: cbb8c220e70d25d1108db39d7956b08a66492fad h: refs/heads/master i: 296837: 7d4d15e7a5217b2348bca4253e7b99d81b766a4c 296835: a1cc5bb08da25df37575dc541b4797f5e79fea0e 296831: 9a955b4fdb7745ff9787053b875528e5dcdb497d v: v3 --- [refs] | 2 +- trunk/drivers/mfd/omap-usb-host.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e3e9ca43c5d6..0bff64594fb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 231dd9c8994430d4aaa75cdee95af13c154f489f +refs/heads/master: cbb8c220e70d25d1108db39d7956b08a66492fad diff --git a/trunk/drivers/mfd/omap-usb-host.c b/trunk/drivers/mfd/omap-usb-host.c index 68ac2c55d5ae..680041189c41 100644 --- a/trunk/drivers/mfd/omap-usb-host.c +++ b/trunk/drivers/mfd/omap-usb-host.c @@ -170,7 +170,7 @@ struct usbhs_hcd_omap { /*-------------------------------------------------------------------------*/ const char usbhs_driver_name[] = USBHS_DRIVER_NAME; -static u64 usbhs_dmamask = ~(u32)0; +static u64 usbhs_dmamask = DMA_BIT_MASK(32); /*-------------------------------------------------------------------------*/ @@ -223,7 +223,7 @@ static struct platform_device *omap_usbhs_alloc_child(const char *name, } child->dev.dma_mask = &usbhs_dmamask; - child->dev.coherent_dma_mask = 0xffffffff; + dma_set_coherent_mask(&child->dev, DMA_BIT_MASK(32)); child->dev.parent = dev; ret = platform_device_add(child);