diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 8d3843d74098..c213a2e56e55 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -249,7 +249,6 @@ int zd_ioread16(struct zd_chip *chip, zd_addr_t addr, u16 *value) | |||
249 | { | 249 | { |
250 | int r; | 250 | int r; |
251 | 251 | ||
252 | ZD_ASSERT(!mutex_is_locked(&chip->mutex)); | ||
253 | mutex_lock(&chip->mutex); | 252 | mutex_lock(&chip->mutex); |
254 | r = zd_ioread16_locked(chip, value, addr); | 253 | r = zd_ioread16_locked(chip, value, addr); |
255 | mutex_unlock(&chip->mutex); | 254 | mutex_unlock(&chip->mutex); |
@@ -260,7 +259,6 @@ int zd_ioread32(struct zd_chip *chip, zd_addr_t addr, u32 *value) | |||
260 | { | 259 | { |
261 | int r; | 260 | int r; |
262 | 261 | ||
263 | ZD_ASSERT(!mutex_is_locked(&chip->mutex)); | ||
264 | mutex_lock(&chip->mutex); | 262 | mutex_lock(&chip->mutex); |
265 | r = zd_ioread32_locked(chip, value, addr); | 263 | r = zd_ioread32_locked(chip, value, addr); |
266 | mutex_unlock(&chip->mutex); | 264 | mutex_unlock(&chip->mutex); |
@@ -271,7 +269,6 @@ int zd_iowrite16(struct zd_chip *chip, zd_addr_t addr, u16 value) | |||
271 | { | 269 | { |
272 | int r; | 270 | int r; |
273 | 271 | ||
274 | ZD_ASSERT(!mutex_is_locked(&chip->mutex)); | ||
275 | mutex_lock(&chip->mutex); | 272 | mutex_lock(&chip->mutex); |
276 | r = zd_iowrite16_locked(chip, value, addr); | 273 | r = zd_iowrite16_locked(chip, value, addr); |
277 | mutex_unlock(&chip->mutex); | 274 | mutex_unlock(&chip->mutex); |
@@ -282,7 +279,6 @@ int zd_iowrite32(struct zd_chip *chip, zd_addr_t addr, u32 value) | |||
282 | { | 279 | { |
283 | int r; | 280 | int r; |
284 | 281 | ||
285 | ZD_ASSERT(!mutex_is_locked(&chip->mutex)); | ||
286 | mutex_lock(&chip->mutex); | 282 | mutex_lock(&chip->mutex); |
287 | r = zd_iowrite32_locked(chip, value, addr); | 283 | r = zd_iowrite32_locked(chip, value, addr); |
288 | mutex_unlock(&chip->mutex); | 284 | mutex_unlock(&chip->mutex); |
@@ -294,7 +290,6 @@ int zd_ioread32v(struct zd_chip *chip, const zd_addr_t *addresses, | |||
294 | { | 290 | { |
295 | int r; | 291 | int r; |
296 | 292 | ||
297 | ZD_ASSERT(!mutex_is_locked(&chip->mutex)); | ||
298 | mutex_lock(&chip->mutex); | 293 | mutex_lock(&chip->mutex); |
299 | r = zd_ioread32v_locked(chip, values, addresses, count); | 294 | r = zd_ioread32v_locked(chip, values, addresses, count); |
300 | mutex_unlock(&chip->mutex); | 295 | mutex_unlock(&chip->mutex); |
@@ -306,7 +301,6 @@ int zd_iowrite32a(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs, | |||
306 | { | 301 | { |
307 | int r; | 302 | int r; |
308 | 303 | ||
309 | ZD_ASSERT(!mutex_is_locked(&chip->mutex)); | ||
310 | mutex_lock(&chip->mutex); | 304 | mutex_lock(&chip->mutex); |
311 | r = zd_iowrite32a_locked(chip, ioreqs, count); | 305 | r = zd_iowrite32a_locked(chip, ioreqs, count); |
312 | mutex_unlock(&chip->mutex); | 306 | mutex_unlock(&chip->mutex); |