diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 07:49:39 -0500 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/regulator/wm831x-isink.c | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/regulator/wm831x-isink.c')
| -rw-r--r-- | drivers/regulator/wm831x-isink.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c index 1d8d9879d3a1..48857008758c 100644 --- a/drivers/regulator/wm831x-isink.c +++ b/drivers/regulator/wm831x-isink.c | |||
| @@ -167,6 +167,8 @@ static __devinit int wm831x_isink_probe(struct platform_device *pdev) | |||
| 167 | return -ENOMEM; | 167 | return -ENOMEM; |
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | isink->wm831x = wm831x; | ||
| 171 | |||
| 170 | res = platform_get_resource(pdev, IORESOURCE_IO, 0); | 172 | res = platform_get_resource(pdev, IORESOURCE_IO, 0); |
| 171 | if (res == NULL) { | 173 | if (res == NULL) { |
| 172 | dev_err(&pdev->dev, "No I/O resource\n"); | 174 | dev_err(&pdev->dev, "No I/O resource\n"); |