diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2006-09-09 20:44:50 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-09 20:44:50 +0200 |
| commit | 189e74ee9c18a5440511c5af525377c609d6ebbd (patch) | |
| tree | 7c7e85d3ae869af30c2aaa2e8318015cdead02a5 /arch | |
| parent | [ARM] 3774/1: S3C24XX: SMDK2413 has two machine IDs (diff) | |
| download | linux-189e74ee9c18a5440511c5af525377c609d6ebbd.tar.xz linux-189e74ee9c18a5440511c5af525377c609d6ebbd.zip | |
[ARM] 3775/1: S3C24XX: do not add same sysdev_driver to two classes
Patch from Ben Dooks
The s3c244x-irq.c code makes the mistake of adding
the same drive to two different sys-classes. This
causes the class lists to become corrupted and the
suspend code to OOPS.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c244x-irq.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/s3c244x-irq.c b/arch/arm/mach-s3c2410/s3c244x-irq.c index 74be83c4126e..44c5affa9b89 100644 --- a/arch/arm/mach-s3c2410/s3c244x-irq.c +++ b/arch/arm/mach-s3c2410/s3c244x-irq.c @@ -119,21 +119,24 @@ static int s3c244x_irq_add(struct sys_device *sysdev) return 0; } -static struct sysdev_driver s3c244x_irq_driver = { +static struct sysdev_driver s3c2440_irq_driver = { .add = s3c244x_irq_add, }; static int s3c2440_irq_init(void) { - return sysdev_driver_register(&s3c2440_sysclass, &s3c244x_irq_driver); + return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_irq_driver); } arch_initcall(s3c2440_irq_init); +static struct sysdev_driver s3c2442_irq_driver = { + .add = s3c244x_irq_add, +}; static int s3c2442_irq_init(void) { - return sysdev_driver_register(&s3c2442_sysclass, &s3c244x_irq_driver); + return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_irq_driver); } arch_initcall(s3c2442_irq_init); |