From 93da2040786dfb687e9aa07c7beabcb8f73627bd Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 25 Aug 2012 21:57:09 +0200 Subject: [PATCH] --- yaml --- r: 322682 b: refs/heads/master c: f755bbbf1f9f180aa61eb730d638b62e225bfc10 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/adc/at91_adc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27a6799eef3f..84ba48a74bef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1dc9c1276a4d988b29372fe67796430d5cbc756 +refs/heads/master: f755bbbf1f9f180aa61eb730d638b62e225bfc10 diff --git a/trunk/drivers/iio/adc/at91_adc.c b/trunk/drivers/iio/adc/at91_adc.c index f61780a02374..3bd5540238a7 100644 --- a/trunk/drivers/iio/adc/at91_adc.c +++ b/trunk/drivers/iio/adc/at91_adc.c @@ -617,7 +617,7 @@ static int __devinit at91_adc_probe(struct platform_device *pdev) st->adc_clk = clk_get(&pdev->dev, "adc_op_clk"); if (IS_ERR(st->adc_clk)) { dev_err(&pdev->dev, "Failed to get the ADC clock.\n"); - ret = PTR_ERR(st->clk); + ret = PTR_ERR(st->adc_clk); goto error_disable_clk; }