Merge /spare/repo/linux-2.6/

4 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 1c553d7efdd9..ca5914091d3a 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -389,7 +389,7 @@ config VIA_FIR
         help
           Say Y here if you want to build support for the VIA VT8231
           and VIA VT1211 IrDA controllers, found on the motherboards using
-          those those VIA chipsets. To use this controller, you will need
+          those VIA chipsets. To use this controller, you will need
           to plug a specific 5 pins FIR IrDA dongle in the specific
           motherboard connector. The driver provides support for SIR, MIR
           and FIR (4Mbps) speeds.
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 7d23aa375908..b8d112348ba4 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -626,7 +626,7 @@ static void __exit irtty_sir_cleanup(void)
 {
         int err;
 
-        if ((err = tty_register_ldisc(N_IRDA, NULL))) {
+        if ((err = tty_unregister_ldisc(N_IRDA))) {
                 IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n",
                            __FUNCTION__, err);
         }
diff --git a/drivers/net/irda/sir_kthread.c b/drivers/net/irda/sir_kthread.c
index 18cea1099530..c65054364bca 100644
--- a/drivers/net/irda/sir_kthread.c
+++ b/drivers/net/irda/sir_kthread.c
@@ -135,8 +135,7 @@ static int irda_thread(void *startup)
                 remove_wait_queue(&irda_rq_queue.kick, &wait);
 
                 /* make swsusp happy with our thread */
-                if (current->flags & PF_FREEZE)
-                        refrigerator(PF_FREEZE);
+                try_to_freeze();
 
                 run_irda_queue();
         }
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 66f488c13717..15f207323d97 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -763,7 +763,7 @@ static int stir_transmit_thread(void *arg)
         {
 #ifdef CONFIG_PM
                 /* if suspending, then power off and wait */
-                if (unlikely(current->flags & PF_FREEZE)) {
+                if (unlikely(freezing(current))) {
                         if (stir->receiving)
                                 receive_stop(stir);
                         else
@@ -771,7 +771,7 @@ static int stir_transmit_thread(void *arg)
 
                         write_reg(stir, REG_CTRL1, CTRL1_TXPWD|CTRL1_RXPWD);
 
-                        refrigerator(PF_FREEZE);
+                        refrigerator();
 
                         if (change_speed(stir, stir->speed))
                                 break;