From 19edde75d0d3973dcd3a33bf747802757e0fa32a Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 29 Sep 2010 17:31:30 +0900 Subject: [PATCH] --- yaml --- r: 212292 b: refs/heads/master c: 4a4fd47155ac49b62de5177a780c245e967752f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/amba-pl022.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8ea2d32b1698..f2ad6ea0f799 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e447d3588e1c5944f607083cb509663f8015d420 +refs/heads/master: 4a4fd47155ac49b62de5177a780c245e967752f3 diff --git a/trunk/drivers/spi/amba-pl022.c b/trunk/drivers/spi/amba-pl022.c index 4c37c4e28647..8cdddc97325c 100644 --- a/trunk/drivers/spi/amba-pl022.c +++ b/trunk/drivers/spi/amba-pl022.c @@ -1350,10 +1350,11 @@ static int verify_controller_parameters(struct pl022 *pl022, if ((chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) && (chip_info->duplex != - SSP_MICROWIRE_CHANNEL_HALF_DUPLEX)) + SSP_MICROWIRE_CHANNEL_HALF_DUPLEX)) { dev_err(chip_info->dev, "Microwire duplex mode is configured incorrectly\n"); return -EINVAL; + } } else { if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) dev_err(chip_info->dev,