From f0ff24f0e8e4dfb97912e36f320cf633c0a6e2fe Mon Sep 17 00:00:00 2001 From: Andrew Miller Date: Wed, 14 Mar 2012 18:26:58 -0400 Subject: [PATCH] --- yaml --- r: 289248 b: refs/heads/master c: 24a39f702b0f5a997018c76b7730bb416a53e7bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_core.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 48097bc01934..2a4f10992799 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd6868080efcef7df4ffef860b54994be6d268a9 +refs/heads/master: 24a39f702b0f5a997018c76b7730bb416a53e7bb diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index d1a3e65747e8..42307a3f3824 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -439,8 +439,7 @@ void buffer_free(struct net_device *dev, struct buffer **buffer, int len, short } kfree(tmp); tmp = next; - } - while (next != *buffer); + } while (next != *buffer); *buffer = NULL; } @@ -1618,9 +1617,9 @@ void rtl8180_rx(struct net_device *dev) if (IEEE80211_FTYPE_CTL != type && !bHwError && !bCRC && !bICV && eqMacAddr(priv->ieee80211->current_network.bssid, - fc & IEEE80211_FCTL_TODS ? hdr->addr1 : - fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 : - hdr->addr3)) { + fc & IEEE80211_FCTL_TODS ? hdr->addr1 : + fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 : + hdr->addr3)) { /* Perform signal smoothing for dynamic * mechanism on demand. This is different @@ -3736,7 +3735,7 @@ static int __init rtl8180_pci_module_init(void) DMESG("Wireless extensions version %d", WIRELESS_EXT); rtl8180_proc_module_init(); - if (pci_register_driver(&rtl8180_pci_driver)) { + if (pci_register_driver(&rtl8180_pci_driver)) { DMESG("No device found"); return -ENODEV; }