mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
sony-laptop: Don't unregister the SPIC driver if it wasn't registered
This fixes a warning when the module is unloaded on machines without SPIC. ------------[ cut here ]------------ WARNING: at drivers/base/driver.c:261 driver_unregister+0x6e/0x80() Hardware name: OEM Unexpected driver unregister! Modules linked in: sony_laptop(-) rfkill af_packet i915 drm i2c_algo_bit cfbcopyarea i2c_core cfbimgblt cfbfillrect binfmt_misc ipv6 kvm_intel kvm acpi_cpufreq cpufreq_userspace cpufreq_powersave cpufreq_stats acpi_pad ac video output battery pci_slot sbs sbshc container iptable_filter ip_tables x_tables ext2 fuse snd_hda_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm snd_seq_dummy snd_seq_oss snd_seq_midi_event snd_seq snd_timer snd_seq_device snd fan sg serio_raw sr_mod cdrom soundcore button thermal processor thermal_sys floppy snd_page_alloc pcspkr intel_agp evdev [last unloaded: asus_atk0110] Pid: 8136, comm: modprobe Not tainted 2.6.31-rc8debug #50 Call Trace: [<ffffffff8121ec7e>] ? driver_unregister+0x6e/0x80 [<ffffffff81047577>] warn_slowpath_common+0x87/0xb0 [<ffffffff81047624>] warn_slowpath_fmt+0x64/0x70 [<ffffffff8119a360>] ? kobject_release+0x0/0x1f0 [<ffffffff8119a267>] ? kobject_put+0x27/0x60 [<ffffffff8121d346>] ? bus_put+0x16/0x20 [<ffffffff8121d406>] ? bus_remove_driver+0xb6/0xf0 [<ffffffff8121ec7e>] driver_unregister+0x6e/0x80 [<ffffffff811cab50>] acpi_bus_unregister_driver+0x10/0x12 [<ffffffffa035e86c>] sony_laptop_exit+0x2c/0x2e [sony_laptop] [<ffffffff8107ddc6>] sys_delete_module+0x176/0x230 [<ffffffff8107186d>] ? trace_hardirqs_on_caller+0x14d/0x1a0 [<ffffffff81350a04>] ? trace_hardirqs_on_thunk+0x3a/0x3f [<ffffffff8100bdab>] system_call_fastpath+0x16/0x1b ---[ end trace f638b6a59b19703e ]--- Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
922553f20b
commit
5e6f9725ac
1 changed files with 5 additions and 2 deletions
|
@ -1402,6 +1402,8 @@ static struct sony_pic_dev spic_dev = {
|
|||
.ioports = LIST_HEAD_INIT(spic_dev.ioports),
|
||||
};
|
||||
|
||||
static int spic_drv_registered;
|
||||
|
||||
/* Event masks */
|
||||
#define SONYPI_JOGGER_MASK 0x00000001
|
||||
#define SONYPI_CAPTURE_MASK 0x00000002
|
||||
|
@ -2916,6 +2918,7 @@ static int __init sony_laptop_init(void)
|
|||
"Unable to register SPIC driver.");
|
||||
goto out;
|
||||
}
|
||||
spic_drv_registered = 1;
|
||||
}
|
||||
|
||||
result = acpi_bus_register_driver(&sony_nc_driver);
|
||||
|
@ -2927,7 +2930,7 @@ static int __init sony_laptop_init(void)
|
|||
return 0;
|
||||
|
||||
out_unregister_pic:
|
||||
if (!no_spic)
|
||||
if (spic_drv_registered)
|
||||
acpi_bus_unregister_driver(&sony_pic_driver);
|
||||
out:
|
||||
return result;
|
||||
|
@ -2936,7 +2939,7 @@ static int __init sony_laptop_init(void)
|
|||
static void __exit sony_laptop_exit(void)
|
||||
{
|
||||
acpi_bus_unregister_driver(&sony_nc_driver);
|
||||
if (!no_spic)
|
||||
if (spic_drv_registered)
|
||||
acpi_bus_unregister_driver(&sony_pic_driver);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue