aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/specialix.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index c0ef0f0e5800..f52c7c31badf 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -182,7 +182,6 @@ static int sx_poll = HZ;
182#define RS_EVENT_WRITE_WAKEUP 0 182#define RS_EVENT_WRITE_WAKEUP 0
183 183
184static struct tty_driver *specialix_driver; 184static struct tty_driver *specialix_driver;
185static unsigned char * tmp_buf;
186 185
187static unsigned long baud_table[] = { 186static unsigned long baud_table[] = {
188 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 187 0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
@@ -1674,7 +1673,7 @@ static int sx_write(struct tty_struct * tty,
1674 1673
1675 bp = port_Board(port); 1674 bp = port_Board(port);
1676 1675
1677 if (!port->xmit_buf || !tmp_buf) { 1676 if (!port->xmit_buf) {
1678 func_exit(); 1677 func_exit();
1679 return 0; 1678 return 0;
1680 } 1679 }
@@ -2398,12 +2397,6 @@ static int sx_init_drivers(void)
2398 return 1; 2397 return 1;
2399 } 2398 }
2400 2399
2401 if (!(tmp_buf = (unsigned char *) get_zeroed_page(GFP_KERNEL))) {
2402 printk(KERN_ERR "sx: Couldn't get free page.\n");
2403 put_tty_driver(specialix_driver);
2404 func_exit();
2405 return 1;
2406 }
2407 specialix_driver->owner = THIS_MODULE; 2400 specialix_driver->owner = THIS_MODULE;
2408 specialix_driver->name = "ttyW"; 2401 specialix_driver->name = "ttyW";
2409 specialix_driver->major = SPECIALIX_NORMAL_MAJOR; 2402 specialix_driver->major = SPECIALIX_NORMAL_MAJOR;
@@ -2417,7 +2410,6 @@ static int sx_init_drivers(void)
2417 2410
2418 if ((error = tty_register_driver(specialix_driver))) { 2411 if ((error = tty_register_driver(specialix_driver))) {
2419 put_tty_driver(specialix_driver); 2412 put_tty_driver(specialix_driver);
2420 free_page((unsigned long)tmp_buf);
2421 printk(KERN_ERR "sx: Couldn't register specialix IO8+ driver, error = %d\n", 2413 printk(KERN_ERR "sx: Couldn't register specialix IO8+ driver, error = %d\n",
2422 error); 2414 error);
2423 func_exit(); 2415 func_exit();
@@ -2443,7 +2435,6 @@ static void sx_release_drivers(void)
2443{ 2435{
2444 func_enter(); 2436 func_enter();
2445 2437
2446 free_page((unsigned long)tmp_buf);
2447 tty_unregister_driver(specialix_driver); 2438 tty_unregister_driver(specialix_driver);
2448 put_tty_driver(specialix_driver); 2439 put_tty_driver(specialix_driver);
2449 func_exit(); 2440 func_exit();