Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37661
b: refs/heads/master
c: 365e022
h: refs/heads/master
i:
  37659: 73d7070
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Oct 1, 2006
1 parent 6d68196 commit f52926e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 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: 6e9a4738c9fadb7cbdcabc1e3b415159f3741ed9
refs/heads/master: 365e02237b164701897244aab7412b21c5e622af
11 changes: 1 addition & 10 deletions trunk/drivers/char/specialix.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ static int sx_poll = HZ;
#define RS_EVENT_WRITE_WAKEUP 0

static struct tty_driver *specialix_driver;
static unsigned char * tmp_buf;

static unsigned long baud_table[] = {
0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
Expand Down Expand Up @@ -1674,7 +1673,7 @@ static int sx_write(struct tty_struct * tty,

bp = port_Board(port);

if (!port->xmit_buf || !tmp_buf) {
if (!port->xmit_buf) {
func_exit();
return 0;
}
Expand Down Expand Up @@ -2398,12 +2397,6 @@ static int sx_init_drivers(void)
return 1;
}

if (!(tmp_buf = (unsigned char *) get_zeroed_page(GFP_KERNEL))) {
printk(KERN_ERR "sx: Couldn't get free page.\n");
put_tty_driver(specialix_driver);
func_exit();
return 1;
}
specialix_driver->owner = THIS_MODULE;
specialix_driver->name = "ttyW";
specialix_driver->major = SPECIALIX_NORMAL_MAJOR;
Expand All @@ -2417,7 +2410,6 @@ static int sx_init_drivers(void)

if ((error = tty_register_driver(specialix_driver))) {
put_tty_driver(specialix_driver);
free_page((unsigned long)tmp_buf);
printk(KERN_ERR "sx: Couldn't register specialix IO8+ driver, error = %d\n",
error);
func_exit();
Expand All @@ -2443,7 +2435,6 @@ static void sx_release_drivers(void)
{
func_enter();

free_page((unsigned long)tmp_buf);
tty_unregister_driver(specialix_driver);
put_tty_driver(specialix_driver);
func_exit();
Expand Down

0 comments on commit f52926e

Please sign in to comment.