diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 14:25:28 -0700 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 14:25:28 -0700 |
commit | cb1f7be73b6f708d4f4ce225a3bbc02908b729e4 (patch) | |
tree | 19045178e6c4271c86ff81e51d8e21ec12520f03 /arch/arm | |
parent | 6fe43f9e3701f7a9f2be151a5e6cfe94b87e92f9 (diff) | |
parent | bb7e257ef8d8ba43cab356aa1cc1b20d0106d45f (diff) | |
download | talos-op-linux-cb1f7be73b6f708d4f4ce225a3bbc02908b729e4.tar.gz talos-op-linux-cb1f7be73b6f708d4f4ce225a3bbc02908b729e4.zip |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm')
-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); |