]> err.no Git - linux-2.6/commit
ARM: OMAP: fix omap i2c init (regression)
authorDavid Brownell <david-b@pacbell.net>
Tue, 26 Feb 2008 19:02:30 +0000 (11:02 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 5 Mar 2008 08:23:20 +0000 (10:23 +0200)
commitcfa9a63a9ad25fd3d3218a4e95f5a93090669f3c
tree2ce539166306d931a2b774b0c2246939cede17c0
parent8ba55c5c139f9be26b87d3aab9998f54d8d3057a
ARM: OMAP: fix omap i2c init (regression)

In mainline, the "old style" I2C registration was only removed for
OMAP2, leading to init-time bugs (regressions) like:

    sysfs: duplicate filename 'i2c_omap.1' can not be created
    ------------[ cut here ]------------
    WARNING: at fs/sysfs/dir.c:424 sysfs_add_one+0x40/0xd4()
    Modules linked in:
     ... deletia ...
    [<c0036a38>] (omap_init_i2c+0x0/0x50) from [<c000cea8>] (omap_init_devices+0x10/0x24)
     r4:c001e000
    [<c000ce98>] (omap_init_devices+0x0/0x24) from [<c0008684>] (do_initcalls+0x78/0x200)
     ... deletia ...
    ---[ end trace ca143223eefdc828 ]---
    kobject_add_internal failed for i2c_omap.1 with -EEXIST, don't try to register things with the same name in the same directory.

The fix is obvious:  remove the old init code, it's no longer needed.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/devices.c