diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-27 18:32:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-27 18:32:08 +0200 |
| commit | 219f358e0ba9a98640341e030533089860af1cc6 (patch) | |
| tree | 3004773886a9d65c194c8ebf43e07f53cbe79af9 | |
| parent | All Arch: remove linkage for sys_nfsservctl system call (diff) | |
| parent | firewire: sbp2: fix panic after rmmod with slow targets (diff) | |
| download | linux-219f358e0ba9a98640341e030533089860af1cc6.tar.xz linux-219f358e0ba9a98640341e030533089860af1cc6.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: sbp2: fix panic after rmmod with slow targets
| -rw-r--r-- | drivers/firewire/sbp2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 41841a3e3f99..17cef864506a 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -1198,6 +1198,10 @@ static int sbp2_remove(struct device *dev) { struct fw_unit *unit = fw_unit(dev); struct sbp2_target *tgt = dev_get_drvdata(&unit->device); + struct sbp2_logical_unit *lu; + + list_for_each_entry(lu, &tgt->lu_list, link) + cancel_delayed_work_sync(&lu->work); sbp2_target_put(tgt); return 0; |