redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

rtc: ds3232: add register access error checks

Browse source 
Add missing register access error checks and make it return error code
or print error message.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Akinobu Mita 2016-03-07 00:27:50 +09:00 committed by Alexandre Belloni
parent dfc2532b55
commit 7b4393a62f
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/rtc/rtc-ds3232.c
View file

@ -262,6 +262,8 @@ static int ds3232_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
goto out;
ret = regmap_bulk_write(ds3232->regmap, DS3232_REG_ALARM1, buf, 4);
if (ret)
goto out;
if (alarm->enabled) {
control |= DS3232_REG_CR_A1IE;
@ -272,7 +274,7 @@ out:
return ret;
}
static void ds3232_update_alarm(struct device *dev, unsigned int enabled)
static int ds3232_update_alarm(struct device *dev, unsigned int enabled)
{
struct ds3232 *ds3232 = dev_get_drvdata(dev);
int control;
@ -308,10 +310,12 @@ static void ds3232_update_alarm(struct device *dev, unsigned int enabled)
else
/* disable alarm1 interrupt */
control &= ~(DS3232_REG_CR_A1IE);
regmap_write(ds3232->regmap, DS3232_REG_CR, control);
ret = regmap_write(ds3232->regmap, DS3232_REG_CR, control);
unlock:
mutex_unlock(&ds3232->mutex);
return ret;
}
static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled)
@ -321,9 +325,7 @@ static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled)
if (ds3232->irq <= 0)
return -EINVAL;
ds3232_update_alarm(dev, enabled);
return 0;
return ds3232_update_alarm(dev, enabled);
}
static irqreturn_t ds3232_irq(int irq, void *dev_id)
@ -364,11 +366,24 @@ static void ds3232_work(struct work_struct *work)
} else {
/* disable alarm1 interrupt */
control &= ~(DS3232_REG_CR_A1IE);
regmap_write(ds3232->regmap, DS3232_REG_CR, control);
ret = regmap_write(ds3232->regmap, DS3232_REG_CR,
control);
if (ret) {
dev_warn(ds3232->dev,
"Write Control Register error %d\n",
ret);
goto unlock;
}
/* clear the alarm pend flag */
stat &= ~DS3232_REG_SR_A1F;
regmap_write(ds3232->regmap, DS3232_REG_SR, stat);
ret = regmap_write(ds3232->regmap, DS3232_REG_SR, stat);
if (ret) {
dev_warn(ds3232->dev,
"Write Status Register error %d\n",
ret);
goto unlock;
}
rtc_update_irq(ds3232->rtc, 1, RTC_AF | RTC_IRQF);