cdc_ether: Ignore bogus union descriptor for RNDIS devices

[~andy/linux] / drivers / net / netconsole.c

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index e8882023576b94206d5cc13773c27b3af20761ea..f9347ea3d381e113d20c6a13ec32f0f51c5fc04c 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -169,10 +169,8 @@ static struct netconsole_target *alloc_param_target(char *target_config)
         * Note that these targets get their config_item fields zeroed-out.
         */
        nt = kzalloc(sizeof(*nt), GFP_KERNEL);
-       if (!nt) {
-               printk(KERN_ERR "netconsole: failed to allocate memory\n");
+       if (!nt)
                goto fail;
-       }
 
        nt->np.name = "netconsole";
        strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
@@ -551,10 +549,8 @@ static struct config_item *make_netconsole_target(struct config_group *group,
         * Target is disabled at creation (enabled == 0).
         */
        nt = kzalloc(sizeof(*nt), GFP_KERNEL);
-       if (!nt) {
-               printk(KERN_ERR "netconsole: failed to allocate memory\n");
+       if (!nt)
                return ERR_PTR(-ENOMEM);
-       }
 
        nt->np.name = "netconsole";
        strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);