diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-19 12:13:58 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-19 12:13:58 +0100 |
| commit | e087a412b45543a87497f0a213dbd5d55099f267 (patch) | |
| tree | 8892cc84dbee2b4387c9f2604a7892b6ef3aab25 /arch/arm/mach-s3c2410/clock.c | |
| parent | 7946ada30bc45546cefc85809ba0fd07879eff52 (diff) | |
| parent | bb7e257ef8d8ba43cab356aa1cc1b20d0106d45f (diff) | |
| download | op-kernel-dev-e087a412b45543a87497f0a213dbd5d55099f267.zip op-kernel-dev-e087a412b45543a87497f0a213dbd5d55099f267.tar.gz | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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 f596082..8b3d5dc 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); |
