Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

Browse Source 
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM QoS: Fix inline documentation.
  PM QoS: Fix kzalloc() parameters swapped in pm_qos_power_open()
This commit is contained in:
Linus Torvalds 2010-08-28 14:06:19 -07:00
commit 6f4dbeca1a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/pm_qos_params.c
View File

@ -212,15 +212,17 @@ EXPORT_SYMBOL_GPL(pm_qos_request_active);
/** /**
* pm_qos_add_request - inserts new qos request into the list * pm_qos_add_request - inserts new qos request into the list
* @pm_qos_class: identifies which list of qos request to us * @dep: pointer to a preallocated handle
* @pm_qos_class: identifies which list of qos request to use
* @value: defines the qos request * @value: defines the qos request
* *
* This function inserts a new entry in the pm_qos_class list of requested qos * This function inserts a new entry in the pm_qos_class list of requested qos
* performance characteristics. It recomputes the aggregate QoS expectations * performance characteristics. It recomputes the aggregate QoS expectations
* for the pm_qos_class of parameters, and returns the pm_qos_request list * for the pm_qos_class of parameters and initializes the pm_qos_request_list
* element as a handle for use in updating and removal. Call needs to save * handle. Caller needs to save this handle for later use in updates and
* this handle for later use. * removal.
*/ */
void pm_qos_add_request(struct pm_qos_request_list *dep, void pm_qos_add_request(struct pm_qos_request_list *dep,
int pm_qos_class, s32 value) int pm_qos_class, s32 value)
{ {
@ -348,7 +350,7 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp)
pm_qos_class = find_pm_qos_object_by_minor(iminor(inode)); pm_qos_class = find_pm_qos_object_by_minor(iminor(inode));
if (pm_qos_class >= 0) { if (pm_qos_class >= 0) {
struct pm_qos_request_list *req = kzalloc(GFP_KERNEL, sizeof(*req)); struct pm_qos_request_list *req = kzalloc(sizeof(*req), GFP_KERNEL);
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;