FreeBSD Bugzilla – Attachment 154016 Details for
Bug 197143
[wpi] [patch]: sync with iwn / OpenBSD wpi
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix error handling in wpi_scan()
patch-wpi12.diff (text/plain), 946 bytes, created by
Andriy Voskoboinyk
on 2015-03-08 14:56:32 UTC
(
hide
)
Description:
Fix error handling in wpi_scan()
Filename:
MIME Type:
Creator:
Andriy Voskoboinyk
Created:
2015-03-08 14:56:32 UTC
Size:
946 bytes
patch
obsolete
>Index: sys/dev/wpi/if_wpi.c >=================================================================== >--- sys/dev/wpi/if_wpi.c (revision 279775) >+++ sys/dev/wpi/if_wpi.c (working copy) >@@ -3600,6 +3600,9 @@ > if (sc->sc_scan_timer) { > device_printf(sc->sc_dev, "%s: called whilst scanning!\n", > __func__); >+ >+ DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END_ERR, __func__); >+ > return (EAGAIN); > } > >@@ -3608,7 +3611,8 @@ > device_printf(sc->sc_dev, > "%s: could not allocate buffer for scan command\n", > __func__); >- return ENOMEM; >+ error = ENOMEM; >+ goto fail; > } > hdr = (struct wpi_scan_hdr *)buf; > >@@ -3733,10 +3737,17 @@ > error = wpi_cmd(sc, WPI_CMD_SCAN, buf, buflen, 1); > free(buf, M_DEVBUF); > >+ if (error != 0) >+ goto fail; >+ > sc->sc_scan_timer = 5; > > DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); > >+ return 0; >+ >+fail: DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END_ERR, __func__); >+ > return error; > } >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=154016">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 197143
:
152282
|
152662
|
152977
|
153911
|
153977
|
153983
|
153985
|
153999
|
154000
|
154002
|
154006
|
154007
|
154009
|
154010
|
154011
|
154013
|
154015
| 154016 |
154017
|
154019
|
154020
|
154021
|
154022
|
154024
|
154026
|
154030
|
154032
|
154033
|
154328
|
154329
|
154330
|
154332
|
154334
|
154335
|
154336
|
154337
|
154338
|
154340
|
154341
|
154343
|
154346
|
154347
|
154348
|
154349
|
154350
|
154351
|
154352
|
154353
|
154354
|
154355
|
154356
|
154357
|
154358
|
154359
|
154360
|
154361
|
154362
|
154363
|
154364
|
154365
|
154366
|
154368
|
154369
|
154370
|
154371
|
154372
|
154373
|
154374
|
154375
|
154378
|
154379
|
154380
|
154381
|
154382
|
154383
|
154384
|
155332
|
155333
|
156164
|
156165
|
156166
|
156167
|
156168
|
156169
|
156170
|
156171
|
156172
|
156173
|
156174
|
156175
|
156176
|
156177
|
156178
|
156179
|
156180
|
156181
|
156182
|
156183
|
156184
|
156185
|
156186
|
156187
|
156188
|
156189
|
156190
|
156191
|
156192
|
156193
|
156194
|
156195