V4L/DVB (8475): pvrusb2: Cosmetic macro fix (benign)

[linux-2.6] / drivers / net / netconsole.c

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 387a13395015ce940fd68fe61a5153d39beeaf0a..e13966bb5f7749d8462e76fb3d9aa802b80eab46 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -585,9 +585,8 @@ static struct config_item_type netconsole_target_type = {
  * Group operations and type for netconsole_subsys.
  */
 
-static int make_netconsole_target(struct config_group *group,
-                                 const char *name,
-                                 struct config_item **new_item)
+static struct config_item *make_netconsole_target(struct config_group *group,
+                                                 const char *name)
 {
        unsigned long flags;
        struct netconsole_target *nt;
@@ -599,7 +598,7 @@ static int make_netconsole_target(struct config_group *group,
        nt = kzalloc(sizeof(*nt), GFP_KERNEL);
        if (!nt) {
                printk(KERN_ERR "netconsole: failed to allocate memory\n");
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
        }
 
        nt->np.name = "netconsole";
@@ -616,8 +615,7 @@ static int make_netconsole_target(struct config_group *group,
        list_add(&nt->list, &target_list);
        spin_unlock_irqrestore(&target_list_lock, flags);
 
-       *new_item = &nt->item;
-       return 0;
+       return &nt->item;
 }
 
 static void drop_netconsole_target(struct config_group *group,