From: Linus Torvalds Date: Tue, 26 Sep 2006 18:49:46 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 X-Git-Tag: v2.6.19-rc1~1078 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd77a4ee0f3981693d4229aa1d57cea9e526ff47;p=linux-2.6-omap-h63xx.git Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (47 commits) Driver core: Don't call put methods while holding a spinlock Driver core: Remove unneeded routines from driver core Driver core: Fix potential deadlock in driver core PCI: enable driver multi-threaded probe Driver Core: add ability for drivers to do a threaded probe sysfs: add proper sysfs_init() prototype drivers/base: check errors drivers/base: Platform notify needs to occur before drivers attach to the device v4l-dev2: handle __must_check add CONFIG_ENABLE_MUST_CHECK add __must_check to device management code Driver core: fixed add_bind_files() definition Driver core: fix comments in drivers/base/power/resume.c sysfs_remove_bin_file: no return value, dump_stack on error kobject: must_check fixes Driver core: add ability for devices to create and remove bin files Class: add support for class interfaces for devices Driver core: create devices/virtual/ tree Driver core: add device_rename function Driver core: add ability for classes to handle devices properly ... --- dd77a4ee0f3981693d4229aa1d57cea9e526ff47 diff --cc kernel/power/user.c index 2e4499f3e4d,5a8d060d790..72825c853cd --- a/kernel/power/user.c +++ b/kernel/power/user.c @@@ -193,10 -189,9 +193,10 @@@ static int snapshot_ioctl(struct inode error = -EPERM; break; } + snapshot_free_unused_memory(&data->handle); down(&pm_sem); pm_prepare_console(); - error = device_suspend(PMSG_FREEZE); + error = device_suspend(PMSG_PRETHAW); if (!error) { error = swsusp_resume(); device_resume();