Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8192e / rtllib_module.c

diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index 0cf38091f8c51cd17123d1fe8d9e99c6608edaf1..32cc8df9d3a76a9efae7fac3491082fbf4c83e3d 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -72,11 +72,8 @@ static inline int rtllib_networks_allocate(struct rtllib_device *ieee)
        ieee->networks = kzalloc(
                MAX_NETWORK_COUNT * sizeof(struct rtllib_network),
                GFP_KERNEL);
-       if (!ieee->networks) {
-               printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
-                      ieee->dev->name);
+       if (!ieee->networks)
                return -ENOMEM;
-       }
 
        return 0;
 }
@@ -161,10 +158,9 @@ struct net_device *alloc_rtllib(int sizeof_priv)
        rtllib_softmac_init(ieee);
 
        ieee->pHTInfo = kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL);
-       if (ieee->pHTInfo == NULL) {
-               RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for HTInfo\n");
+       if (ieee->pHTInfo == NULL)
                return NULL;
-       }
+
        HTUpdateDefaultSetting(ieee);
        HTInitializeHTInfo(ieee);
        TSInitialize(ieee);
@@ -207,7 +203,9 @@ static struct proc_dir_entry *rtllib_proc;
 
 static int show_debug_level(struct seq_file *m, void *v)
 {
-       return seq_printf(m, "0x%08X\n", rtllib_debug_level);
+       seq_printf(m, "0x%08X\n", rtllib_debug_level);
+
+       return 0;
 }
 
 static ssize_t write_debug_level(struct file *file, const char __user *buffer,