Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: fix panic in handle_at_packet
This commit is contained in:
commit
45ddfbf959
|
@ -736,6 +736,12 @@ fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The response handler may be executed while the request handler
|
||||||
|
* is still pending. Cancel the request handler.
|
||||||
|
*/
|
||||||
|
card->driver->cancel_packet(card, &t->packet);
|
||||||
|
|
||||||
t->callback(card, rcode, data, data_length, t->callback_data);
|
t->callback(card, rcode, data, data_length, t->callback_data);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(fw_core_handle_response);
|
EXPORT_SYMBOL(fw_core_handle_response);
|
||||||
|
|
Loading…
Reference in New Issue