diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-15 04:58:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-15 04:58:21 -0400 |
| commit | 9fa264d0d327a67db4913b400bcfb174d929054c (patch) | |
| tree | ec2ba2b7d6d9c32e7bdb2d2aa8c61bfe48546664 /drivers | |
| parent | 0882e8dd3aad33eca41696d463bb896e6c8817eb (diff) | |
| parent | 6845a658e09767e72c12558825ed66a9eda02737 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 2 |
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) | |||
| 195 | struct chip_data *chip = drv_data->cur_chip; | 195 | struct chip_data *chip = drv_data->cur_chip; |
| 196 | 196 | ||
| 197 | if (chip->cs_control) { | 197 | if (chip->cs_control) { |
| 198 | chip->cs_control(PXA2XX_CS_ASSERT); | 198 | chip->cs_control(PXA2XX_CS_DEASSERT); |
| 199 | return; | 199 | return; |
| 200 | } | 200 | } |
| 201 | 201 | ||