aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/debugfs.c2
-rw-r--r--drivers/net/wireless/libertas/ethtool.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 6d95148e8725..816f42e4f5b4 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1838,7 +1838,7 @@ static ssize_t wlan_debugfs_write(struct file *f, const char __user *buf,
1838 char *p2; 1838 char *p2;
1839 struct debug_data *d = (struct debug_data *)f->private_data; 1839 struct debug_data *d = (struct debug_data *)f->private_data;
1840 1840
1841 pdata = (char *)kmalloc(cnt, GFP_KERNEL); 1841 pdata = kmalloc(cnt, GFP_KERNEL);
1842 if (pdata == NULL) 1842 if (pdata == NULL)
1843 return 0; 1843 return 0;
1844 1844
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index ec99cb825871..d793d843f7d5 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -60,8 +60,7 @@ static int libertas_ethtool_get_eeprom(struct net_device *dev,
60 60
61// mutex_lock(&priv->mutex); 61// mutex_lock(&priv->mutex);
62 62
63 adapter->prdeeprom = 63 adapter->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
64 (char *)kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
65 if (!adapter->prdeeprom) 64 if (!adapter->prdeeprom)
66 return -ENOMEM; 65 return -ENOMEM;
67 memcpy(adapter->prdeeprom, &regctrl, sizeof(regctrl)); 66 memcpy(adapter->prdeeprom, &regctrl, sizeof(regctrl));