Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274174
b: refs/heads/master
c: ac07a4a
h: refs/heads/master
v: v3
  • Loading branch information
Brian King authored and Benjamin Herrenschmidt committed Sep 20, 2011
1 parent c65cea2 commit eeda1f9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8bdafa39a47265bc029838b35cc6585f69224afa
refs/heads/master: ac07a4a57f7408922a0b3d4dcb87104fe8a3d8ca
6 changes: 3 additions & 3 deletions trunk/drivers/tty/hvc/hvcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,7 @@ static int __devinit hvcs_initialize(void)
goto register_fail;
}

hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
hvcs_pi_buff = (unsigned long *) __get_free_page(GFP_KERNEL);
if (!hvcs_pi_buff) {
rc = -ENOMEM;
goto buff_alloc_fail;
Expand All @@ -1548,7 +1548,7 @@ static int __devinit hvcs_initialize(void)
return 0;

kthread_fail:
kfree(hvcs_pi_buff);
free_page((unsigned long)hvcs_pi_buff);
buff_alloc_fail:
tty_unregister_driver(hvcs_tty_driver);
register_fail:
Expand Down Expand Up @@ -1597,7 +1597,7 @@ static void __exit hvcs_module_exit(void)
kthread_stop(hvcs_task);

spin_lock(&hvcs_pi_lock);
kfree(hvcs_pi_buff);
free_page((unsigned long)hvcs_pi_buff);
hvcs_pi_buff = NULL;
spin_unlock(&hvcs_pi_lock);

Expand Down

0 comments on commit eeda1f9

Please sign in to comment.