diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:04:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 09:04:38 -0400 |
commit | 54e514b91b95d6441c12a7955addfb9f9d2afc65 (patch) | |
tree | 8b73d901bd2a6ec5a31f34a8954e5ea92216dd6c /drivers/scsi | |
parent | 4fc8adcfec3da639da76e8314c9ccefe5bf9a045 (diff) | |
parent | 6c8c90319c0bb1c9e0b68e721359b89ae4f28465 (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge third patchbomb from Andrew Morton:
- various misc things
- a couple of lib/ optimisations
- provide DIV_ROUND_CLOSEST_ULL()
- checkpatch updates
- rtc tree
- befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs
- ptrace fixes
- fork() fixes
- seccomp cleanups
- more mmap_sem hold time reductions from Davidlohr
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (138 commits)
proc: show locks in /proc/pid/fdinfo/X
docs: add missing and new /proc/PID/status file entries, fix typos
drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
Documentation/spi/spidev_test.c: fix warning
drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
.gitignore: ignore *.tar
MAINTAINERS: add Mediatek SoC mailing list
tomoyo: reduce mmap_sem hold for mm->exe_file
powerpc/oprofile: reduce mmap_sem hold for exe_file
oprofile: reduce mmap_sem hold for mm->exe_file
mips: ip32: add platform data hooks to use DS1685 driver
lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
x86: switch to using asm-generic for seccomp.h
sparc: switch to using asm-generic for seccomp.h
powerpc: switch to using asm-generic for seccomp.h
parisc: switch to using asm-generic for seccomp.h
mips: switch to using asm-generic for seccomp.h
microblaze: use asm-generic for seccomp.h
arm: use asm-generic for seccomp.h
seccomp: allow COMPAT sigreturn overrides
...
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/bfa/bfad.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index e90a3742f09d..cc3b9d3d6d40 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c | |||
@@ -1079,22 +1079,18 @@ bfad_start_ops(struct bfad_s *bfad) { | |||
1079 | int | 1079 | int |
1080 | bfad_worker(void *ptr) | 1080 | bfad_worker(void *ptr) |
1081 | { | 1081 | { |
1082 | struct bfad_s *bfad; | 1082 | struct bfad_s *bfad = ptr; |
1083 | unsigned long flags; | 1083 | unsigned long flags; |
1084 | |||
1085 | bfad = (struct bfad_s *)ptr; | ||
1086 | |||
1087 | while (!kthread_should_stop()) { | ||
1088 | 1084 | ||
1089 | /* Send event BFAD_E_INIT_SUCCESS */ | 1085 | if (kthread_should_stop()) |
1090 | bfa_sm_send_event(bfad, BFAD_E_INIT_SUCCESS); | 1086 | return 0; |
1091 | 1087 | ||
1092 | spin_lock_irqsave(&bfad->bfad_lock, flags); | 1088 | /* Send event BFAD_E_INIT_SUCCESS */ |
1093 | bfad->bfad_tsk = NULL; | 1089 | bfa_sm_send_event(bfad, BFAD_E_INIT_SUCCESS); |
1094 | spin_unlock_irqrestore(&bfad->bfad_lock, flags); | ||
1095 | 1090 | ||
1096 | break; | 1091 | spin_lock_irqsave(&bfad->bfad_lock, flags); |
1097 | } | 1092 | bfad->bfad_tsk = NULL; |
1093 | spin_unlock_irqrestore(&bfad->bfad_lock, flags); | ||
1098 | 1094 | ||
1099 | return 0; | 1095 | return 0; |
1100 | } | 1096 | } |