r6040: bump release number to 0.19

[safe/jmp/linux-2.6] / drivers / net / ppp_generic.c

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 3ee7830..c832d60 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -179,7 +179,7 @@ struct channel {
  */
 static DEFINE_MUTEX(all_ppp_mutex);
 static atomic_t ppp_unit_count = ATOMIC_INIT(0);
-static struct idr ppp_units_idr;
+static DEFINE_IDR(ppp_units_idr);
 
 /*
  * all_channels_lock protects all_channels and last_channel_index,
@@ -852,8 +852,6 @@ static int __init ppp_init(void)
                              "ppp");
        }
 
-       idr_init(&ppp_units_idr);
-
 out:
        if (err)
                printk(KERN_ERR "failed to register PPP device (%d)\n", err);
@@ -2435,7 +2433,7 @@ ppp_create_interface(int unit, int *retp)
                if (unit_find(&ppp_units_idr, unit))
                        goto out2; /* unit already exists */
                else {
-                       /* darn, someone is cheatting us? */
+                       /* darn, someone is cheating us? */
                        *retp = -EINVAL;
                        goto out2;
                }