diff options
Diffstat (limited to 'net/irda/irlmp.c')
-rw-r--r-- | net/irda/irlmp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index 7e5d12ab3b90..b134c3cf2bdb 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c | |||
@@ -116,7 +116,7 @@ int __init irlmp_init(void) | |||
116 | * Remove IrLMP layer | 116 | * Remove IrLMP layer |
117 | * | 117 | * |
118 | */ | 118 | */ |
119 | void __exit irlmp_cleanup(void) | 119 | void __exit irlmp_cleanup(void) |
120 | { | 120 | { |
121 | /* Check for main structure */ | 121 | /* Check for main structure */ |
122 | IRDA_ASSERT(irlmp != NULL, return;); | 122 | IRDA_ASSERT(irlmp != NULL, return;); |
@@ -892,7 +892,7 @@ void irlmp_discovery_request(int nslots) | |||
892 | 892 | ||
893 | /* | 893 | /* |
894 | * Start a single discovery operation if discovery is not already | 894 | * Start a single discovery operation if discovery is not already |
895 | * running | 895 | * running |
896 | */ | 896 | */ |
897 | if (!sysctl_discovery) { | 897 | if (!sysctl_discovery) { |
898 | /* Check if user wants to override the default */ | 898 | /* Check if user wants to override the default */ |
@@ -1528,12 +1528,12 @@ int irlmp_unregister_service(void *handle) | |||
1528 | 1528 | ||
1529 | /* Refresh current hint bits */ | 1529 | /* Refresh current hint bits */ |
1530 | spin_lock_irqsave(&irlmp->services->hb_spinlock, flags); | 1530 | spin_lock_irqsave(&irlmp->services->hb_spinlock, flags); |
1531 | service = (irlmp_service_t *) hashbin_get_first(irlmp->services); | 1531 | service = (irlmp_service_t *) hashbin_get_first(irlmp->services); |
1532 | while (service) { | 1532 | while (service) { |
1533 | irlmp->hints.word |= service->hints.word; | 1533 | irlmp->hints.word |= service->hints.word; |
1534 | 1534 | ||
1535 | service = (irlmp_service_t *)hashbin_get_next(irlmp->services); | 1535 | service = (irlmp_service_t *)hashbin_get_next(irlmp->services); |
1536 | } | 1536 | } |
1537 | spin_unlock_irqrestore(&irlmp->services->hb_spinlock, flags); | 1537 | spin_unlock_irqrestore(&irlmp->services->hb_spinlock, flags); |
1538 | return 0; | 1538 | return 0; |
1539 | } | 1539 | } |
@@ -1861,7 +1861,7 @@ static void *irlmp_seq_hb_idx(struct irlmp_iter_state *iter, loff_t *off) | |||
1861 | 1861 | ||
1862 | spin_lock_irq(&iter->hashbin->hb_spinlock); | 1862 | spin_lock_irq(&iter->hashbin->hb_spinlock); |
1863 | for (element = hashbin_get_first(iter->hashbin); | 1863 | for (element = hashbin_get_first(iter->hashbin); |
1864 | element != NULL; | 1864 | element != NULL; |
1865 | element = hashbin_get_next(iter->hashbin)) { | 1865 | element = hashbin_get_next(iter->hashbin)) { |
1866 | if (!off || *off-- == 0) { | 1866 | if (!off || *off-- == 0) { |
1867 | /* NB: hashbin left locked */ | 1867 | /* NB: hashbin left locked */ |
@@ -1918,7 +1918,7 @@ static void *irlmp_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
1918 | if (v == NULL) { /* no more in this hash bin */ | 1918 | if (v == NULL) { /* no more in this hash bin */ |
1919 | spin_unlock_irq(&iter->hashbin->hb_spinlock); | 1919 | spin_unlock_irq(&iter->hashbin->hb_spinlock); |
1920 | 1920 | ||
1921 | if (iter->hashbin == irlmp->unconnected_lsaps) | 1921 | if (iter->hashbin == irlmp->unconnected_lsaps) |
1922 | v = LINK_START_TOKEN; | 1922 | v = LINK_START_TOKEN; |
1923 | 1923 | ||
1924 | iter->hashbin = NULL; | 1924 | iter->hashbin = NULL; |