From 0474973f6b9b72b4c459334d96b1bea86a14e20c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 22 Mar 2010 11:09:20 +0800 Subject: [PATCH] --- yaml --- r: 189015 b: refs/heads/master c: c8c3dcb9df8025ed48f8b14bf4b8a77801d88758 h: refs/heads/master i: 189013: 62099ba5b2467303164c3639ed7a5438c96eb89c 189011: 64a59750f8c7f8f748596106666344dd0e5a85ee 189007: b0ef2ec0b5d233175130c9ee85d51f1fcc498dd9 v: v3 --- [refs] | 2 +- trunk/arch/arm/common/locomo.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 52c92166d3ab..59e8db62f580 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b0d76cb9d5a65567230097a2512046f09f30523 +refs/heads/master: c8c3dcb9df8025ed48f8b14bf4b8a77801d88758 diff --git a/trunk/arch/arm/common/locomo.c b/trunk/arch/arm/common/locomo.c index 4f9ccf60aac2..9dff07c80ddb 100644 --- a/trunk/arch/arm/common/locomo.c +++ b/trunk/arch/arm/common/locomo.c @@ -707,7 +707,7 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */ if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */ printk(KERN_WARNING "locomo: m62332_senddata Error 1\n"); - return; + goto out; } /* Send Sub address (LSB is channel select) */ @@ -735,7 +735,7 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */ if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */ printk(KERN_WARNING "locomo: m62332_senddata Error 2\n"); - return; + goto out; } /* Send DAC data */ @@ -760,9 +760,9 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */ if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */ printk(KERN_WARNING "locomo: m62332_senddata Error 3\n"); - return; } +out: /* stop */ r = locomo_readl(mapbase + LOCOMO_DAC); r &= ~(LOCOMO_DAC_SCLOEB);