linux1394

Pull fireware updates from Stefan Richter: "IEEE 1394 subsystem updates: - Replace made-up, unallocated Vendor and Model values of firewire-core's Configuration ROM register root directory by properly registered IDs. (These IDs are visible to peer nodes on the bus and locally via sysfs, but they are not involved in protocol matching or driver matching, nor are they used in stock udev rules) - Remove some unneccessary code" * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: core: use correct vendor/model IDs firewire: sbp2: remove redundant check for bidi command firewire: ohci: Remove unused function

@@ -1246,14 +1246,14 @@ static const u32 model_textual_descriptor[] = {

static struct fw_descriptor vendor_id_descriptor = {

.length = ARRAY_SIZE(vendor_textual_descriptor),

- .immediate = 0x03d00d1e,

+ .immediate = 0x03001f11,

.key = 0x81000000,

.data = vendor_textual_descriptor,

};

static struct fw_descriptor model_id_descriptor = {

.length = ARRAY_SIZE(model_textual_descriptor),

- .immediate = 0x17000001,

+ .immediate = 0x17023901,

.key = 0x81000000,

.data = model_textual_descriptor,

};

@@ -718,11 +718,6 @@ static inline unsigned int ar_next_buffer_index(unsigned int index)

return (index + 1) % AR_BUFFERS;

}

-static inline unsigned int ar_prev_buffer_index(unsigned int index)

- return (index - 1 + AR_BUFFERS) % AR_BUFFERS;

static inline unsigned int ar_first_buffer_index(struct ar_context *ctx)

{

return ar_next_buffer_index(ctx->last_buffer_index);

@@ -1463,17 +1463,6 @@ static int sbp2_scsi_queuecommand(struct Scsi_Host *shost,

struct sbp2_command_orb *orb;

int generation, retval = SCSI_MLQUEUE_HOST_BUSY;

- /*

- * Bidirectional commands are not yet implemented, and unknown

- * transfer direction not handled.

- */

- if (cmd->sc_data_direction == DMA_BIDIRECTIONAL) {

- dev_err(lu_dev(lu), "cannot handle bidirectional command\n");

- cmd->result = DID_ERROR << 16;

- cmd->scsi_done(cmd);

- return 0;

- }

orb = kzalloc(sizeof(*orb), GFP_ATOMIC);

if (orb == NULL)

return SCSI_MLQUEUE_HOST_BUSY;

Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 - kernel/git/torvalds/linux.git (original) (raw)