mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
IEEE 1394 (FireWire) subsystem updates post v3.3:
- Some SBP-2 initiator fixes, side product from ongoing work on a target.
- Reintroduction of an isochronous I/O feature of the older ieee1394 driver
stack (flush buffer completions); it was evidently rarely used but not
actually unused. Matching libraw1394 code is already available.
- Be sure to prefix all kernel log messages with device name or card name,
and other logging related cleanups.
- Misc other small cleanups, among them a small API change that affects
sound/firewire/ too.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
iQIcBAABAgAGBQJPa5I1AAoJEHnzb7JUXXnQvUoQAMl9PhUk5ZFhWp0AOnQ4uLhI
lEfRnUp94kGBdazBhxM9wtAwZRAeXUev/JyxwymMKSG40dMTbuxqRcs71v6a+ifd
VqNctL0yUncrOw/92l+TG2t/hWttB4u+dTKYX2U5yza42+uUHWMZb7MzmV+qVYc8
H+NR71WLQM4wkWdX8LBxmdeAOm0X635cjKsC/5FX9dws7q1ebSoxs4q4iIaGR7W8
ETWx5lh/UVyR7c9T+VIr0jfQWdsm2IcmHr/+nldlesePZ1gRjIEi69ErEnGxTkGe
NLPwt9lWuFXgWWHBON7C/rLmBA+NSys9lbvRAsPXrb3GpOKlde81c7U7Kr/kmEkh
hB9oM2Qh0A/7sglvIZiDUP565lqOAbXSJzziG3+0XgOP2zsxukm5gSecF8qM8tHY
IDwN05R9+nc26NA5TOfaRWx08n9SqTxq4V326oz9WMuK4bosCEfg4dvMwyMK/V3i
AyipAl2YYIG/2JURMFcGSKbw33dBw3mRsS8XG3MXwzagUMw/8tSyZKQIwF9qO4si
69QV7+CJoEfbJiLJMZJnKrRjfU+ZVRNA/xFuHUmhpmvYIbN8iJVGpGZABfXBUcH0
c1+qX9zE4NEAUEylbgn5raYSY6otF51O8QJzQOn2HRddBQSDpEwhkOGVfZ7zcSLH
sjAOn9qLIMHnrxUXxBDP
=oWbr
-----END PGP SIGNATURE-----
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull IEEE 1394 (FireWire) subsystem updates post v3.3 from Stefan Richter:
- Some SBP-2 initiator fixes, side product from ongoing work on a target.
- Reintroduction of an isochronous I/O feature of the older ieee1394 driver
stack (flush buffer completions); it was evidently rarely used but not
actually unused. Matching libraw1394 code is already available.
- Be sure to prefix all kernel log messages with device name or card name,
and other logging related cleanups.
- Misc other small cleanups, among them a small API change that affects
sound/firewire/ too. Clemens Ladisch is aware of it.
* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: (26 commits)
firewire: allow explicit flushing of iso packet completions
firewire: prevent dropping of completed iso packet header data
firewire: ohci: factor out iso completion flushing code
firewire: ohci: simplify iso header pointer arithmetic
firewire: ohci: optimize control bit checks
firewire: ohci: remove unused excess_bytes field
firewire: ohci: copy_iso_headers(): make comment match the code
firewire: cdev: fix IR multichannel event documentation
firewire: ohci: fix too-early completion of IR multichannel buffers
firewire: ohci: move runtime debug facility out of #ifdef
firewire: tone down some diagnostic log messages
firewire: sbp2: replace a GFP_ATOMIC allocation
firewire: sbp2: Fix SCSI sense data mangling
firewire: sbp2: Ignore SBP-2 targets on the local node
firewire: sbp2: Take into account Unit_Unique_ID
firewire: nosy: Use the macro DMA_BIT_MASK().
firewire: core: convert AR-req handler lock from _irqsave to _bh
firewire: core: fix race at address_handler unregistration
firewire: core: remove obsolete comment
firewire: core: prefix log messages with card name
...
This commit is contained in:
commit
34699403e9
16 changed files with 478 additions and 325 deletions
|
|
@ -611,7 +611,6 @@ static void isight_card_free(struct snd_card *card)
|
|||
|
||||
fw_iso_resources_destroy(&isight->resources);
|
||||
fw_unit_put(isight->unit);
|
||||
fw_device_put(isight->device);
|
||||
mutex_destroy(&isight->mutex);
|
||||
}
|
||||
|
||||
|
|
@ -644,7 +643,7 @@ static int isight_probe(struct device *unit_dev)
|
|||
isight->card = card;
|
||||
mutex_init(&isight->mutex);
|
||||
isight->unit = fw_unit_get(unit);
|
||||
isight->device = fw_device_get(fw_dev);
|
||||
isight->device = fw_dev;
|
||||
isight->audio_base = get_unit_base(unit);
|
||||
if (!isight->audio_base) {
|
||||
dev_err(&unit->device, "audio unit base not found\n");
|
||||
|
|
@ -681,7 +680,6 @@ static int isight_probe(struct device *unit_dev)
|
|||
|
||||
err_unit:
|
||||
fw_unit_put(isight->unit);
|
||||
fw_device_put(isight->device);
|
||||
mutex_destroy(&isight->mutex);
|
||||
error:
|
||||
snd_card_free(card);
|
||||
|
|
|
|||
|
|
@ -656,12 +656,10 @@ static u32 fwspk_read_firmware_version(struct fw_unit *unit)
|
|||
static void fwspk_card_free(struct snd_card *card)
|
||||
{
|
||||
struct fwspk *fwspk = card->private_data;
|
||||
struct fw_device *dev = fw_parent_device(fwspk->unit);
|
||||
|
||||
amdtp_out_stream_destroy(&fwspk->stream);
|
||||
cmp_connection_destroy(&fwspk->connection);
|
||||
fw_unit_put(fwspk->unit);
|
||||
fw_device_put(dev);
|
||||
mutex_destroy(&fwspk->mutex);
|
||||
}
|
||||
|
||||
|
|
@ -718,7 +716,6 @@ static int __devinit fwspk_probe(struct device *unit_dev)
|
|||
fwspk = card->private_data;
|
||||
fwspk->card = card;
|
||||
mutex_init(&fwspk->mutex);
|
||||
fw_device_get(fw_dev);
|
||||
fwspk->unit = fw_unit_get(unit);
|
||||
fwspk->device_info = fwspk_detect(fw_dev);
|
||||
if (!fwspk->device_info) {
|
||||
|
|
@ -767,7 +764,6 @@ err_connection:
|
|||
cmp_connection_destroy(&fwspk->connection);
|
||||
err_unit:
|
||||
fw_unit_put(fwspk->unit);
|
||||
fw_device_put(fw_dev);
|
||||
mutex_destroy(&fwspk->mutex);
|
||||
error:
|
||||
snd_card_free(card);
|
||||
|
|
|
|||
Loading…
Reference in a new issue