diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:07:03 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:07:03 +0200 |
| commit | 475d5928b79bb78326a645863d46ff95c5e25e5a (patch) | |
| tree | a260aed0d94bda824d7f2c5d74b2b1f8002634aa /arch/mips/sgi-ip22/ip22-gio.c | |
| parent | c6b7b9f290c0987194b966d5ea1383e10e1a01b1 (diff) | |
| parent | 1062080a7d8dbe08cefce728341285e77930ef49 (diff) | |
| download | op-kernel-dev-475d5928b79bb78326a645863d46ff95c5e25e5a.zip op-kernel-dev-475d5928b79bb78326a645863d46ff95c5e25e5a.tar.gz | |
Merge branch '3.16-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-gio.c')
| -rw-r--r-- | arch/mips/sgi-ip22/ip22-gio.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c index 8e52446..8f1b86d 100644 --- a/arch/mips/sgi-ip22/ip22-gio.c +++ b/arch/mips/sgi-ip22/ip22-gio.c @@ -27,8 +27,14 @@ static struct { { .name = "SGI GR2/GR3", .id = 0x7f }, }; +static void gio_bus_release(struct device *dev) +{ + kfree(dev); +} + static struct device gio_bus = { .init_name = "gio", + .release = &gio_bus_release, }; /** @@ -413,8 +419,10 @@ int __init ip22_gio_init(void) int ret; ret = device_register(&gio_bus); - if (ret) + if (ret) { + put_device(&gio_bus); return ret; + } ret = bus_register(&gio_bus_type); if (!ret) { |
