diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 02:06:31 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 02:06:31 -0500 |
| commit | c488a4731abb53aa1bab9fccd8a7472083159bfd (patch) | |
| tree | db6d4a664a1e4b7685c1d2d79da63263f40adf7b /arch/avr32/boards/mimc200/setup.c | |
| parent | 6d2ae89c36e2adab5cfa69fecb11290082817ac6 (diff) | |
| parent | bba958783b1b4cb0a9420f4e11082467132a334c (diff) | |
Merge branch 'common/mmcif' into rmobile-latest
Diffstat (limited to 'arch/avr32/boards/mimc200/setup.c')
| -rw-r--r-- | arch/avr32/boards/mimc200/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c index 523d8e183bef..c4da5cba2dbf 100644 --- a/arch/avr32/boards/mimc200/setup.c +++ b/arch/avr32/boards/mimc200/setup.c | |||
| @@ -162,7 +162,7 @@ static void __init set_hw_addr(struct platform_device *pdev) | |||
| 162 | */ | 162 | */ |
| 163 | regs = (void __iomem __force *)res->start; | 163 | regs = (void __iomem __force *)res->start; |
| 164 | pclk = clk_get(&pdev->dev, "pclk"); | 164 | pclk = clk_get(&pdev->dev, "pclk"); |
| 165 | if (!pclk) | 165 | if (IS_ERR(pclk)) |
| 166 | return; | 166 | return; |
| 167 | 167 | ||
| 168 | clk_enable(pclk); | 168 | clk_enable(pclk); |