summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-04-15 09:58:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-15 09:58:21 +0100
commit9fa264d0d327a67db4913b400bcfb174d929054c (patch)
treeec2ba2b7d6d9c32e7bdb2d2aa8c61bfe48546664 /drivers/spi
parent0882e8dd3aad33eca41696d463bb896e6c8817eb (diff)
parent6845a658e09767e72c12558825ed66a9eda02737 (diff)
downloadlinux-9fa264d0d327a67db4913b400bcfb174d929054c.tar.bz2
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/pxa2xx_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index c1688c71f052..c76feea5fe25 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -195,7 +195,7 @@ static void cs_deassert(struct driver_data *drv_data)
struct chip_data *chip = drv_data->cur_chip;
if (chip->cs_control) {
- chip->cs_control(PXA2XX_CS_ASSERT);
+ chip->cs_control(PXA2XX_CS_DEASSERT);
return;
}