diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-18 08:41:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-18 08:41:06 -0700 |
| commit | d846a92e4ec26112fbe41c4e45ddd9119cd74cda (patch) | |
| tree | cacf75b68cee57295cc87e2d8b6c7964d6698133 /arch/arm/mach-s3c2410/clock.c | |
| parent | ace7c769378b9fb2f1fd2c60c04ba3591a6a5af5 (diff) | |
| parent | 251b928cdff5f12e7da8f56e8933e2b58ba08456 (diff) | |
| download | talos-obmc-linux-d846a92e4ec26112fbe41c4e45ddd9119cd74cda.tar.gz talos-obmc-linux-d846a92e4ec26112fbe41c4e45ddd9119cd74cda.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-s3c2410/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/clock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index f59608268751..8b3d5dc35de5 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c @@ -98,7 +98,10 @@ struct clk *clk_get(struct device *dev, const char *id) struct clk *clk = ERR_PTR(-ENOENT); int idno; - idno = (dev == NULL) ? -1 : to_platform_device(dev)->id; + if (dev == NULL || dev->bus != &platform_bus_type) + idno = -1; + else + idno = to_platform_device(dev)->id; down(&clocks_sem); |
