diff options
| author | David S. Miller | 2012-05-15 00:00:48 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-05-15 00:00:48 +0200 |
| commit | c597f6653d5734c11b1e3217c7619a37e96e5a1f (patch) | |
| tree | 2c24b46bbe265f3284dcec0a001f7af498794964 /drivers/net/wireless/at76c50x-usb.c | |
| parent | net: codel: fix build errors (diff) | |
| parent | iwlwifi: fix-up some merge damage from commit 0d6c4a2 (diff) | |
| download | kernel-qcow2-linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.gz kernel-qcow2-linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.xz kernel-qcow2-linux-c597f6653d5734c11b1e3217c7619a37e96e5a1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 5ad74c85a038..3df0146b797e 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -1122,12 +1122,12 @@ exit: static void at76_dump_mib_local(struct at76_priv *priv) { int ret; - struct mib_local *m = kmalloc(sizeof(struct mib_phy), GFP_KERNEL); + struct mib_local *m = kmalloc(sizeof(*m), GFP_KERNEL); if (!m) return; - ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local)); + ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(*m)); if (ret < 0) { wiphy_err(priv->hw->wiphy, "at76_get_mib (LOCAL) failed: %d\n", ret); |