From b2bb432102c799f9ccb925973315d2c630967b19 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 23 Apr 2013 18:30:47 +0200 Subject: [PATCH] --- yaml --- r: 364170 b: refs/heads/master c: 4623c3e0a997e7bac5cb45bb57edcd082f131708 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/daqboard2000.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 6073a6d018cc..2050511f9d48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14d7547c05064dd066aa4c587f35f45fcffa9493 +refs/heads/master: 4623c3e0a997e7bac5cb45bb57edcd082f131708 diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index c1f14f0b6c1a..b87f95c3e17d 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -462,9 +462,9 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev) struct daqboard2000_private *devpriv = dev->private; writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c); - udelay(10000); + mdelay(10); writel(DAQBOARD2000_SECRLocalBusLo, devpriv->plx + 0x6c); - udelay(10000); + mdelay(10); } static void daqboard2000_reloadPLX(struct comedi_device *dev) @@ -472,11 +472,11 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev) struct daqboard2000_private *devpriv = dev->private; writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); - udelay(10000); + mdelay(10); writel(DAQBOARD2000_SECRReloadHi, devpriv->plx + 0x6c); - udelay(10000); + mdelay(10); writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); - udelay(10000); + mdelay(10); } static void daqboard2000_pulseProgPin(struct comedi_device *dev) @@ -484,9 +484,9 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev) struct daqboard2000_private *devpriv = dev->private; writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c); - udelay(10000); + mdelay(10); writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c); - udelay(10000); /* Not in the original code, but I like symmetry... */ + mdelay(10); /* Not in the original code, but I like symmetry... */ } static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)