Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef28963 authored by Peter Osterlund's avatar Peter Osterlund Committed by Linus Torvalds
Browse files

[PATCH] pktcdvd: Correctly set rq->cmd_len in pkt_generic_packet() 



It looks like the code in pkt_generic_packet() worked by luck in the past, but
after commit 186d330e leaving rq->cmd_len
uninitialized doesn't work any more.

Signed-off-by: default avatarPeter Osterlund <petero2@telia.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aa657ca9

drivers/block/pktcdvd.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <linux/suspend.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_ioctl.h>

#include <scsi/scsi.h>



#include <asm/uaccess.h>
@@ -380,6 +381,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * 
	memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE);

	if (sizeof(rq->cmd) > CDROM_PACKET_SIZE)

		memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE);

	rq->cmd_len = COMMAND_SIZE(rq->cmd[0]);



	rq->ref_count++;

	rq->flags |= REQ_NOMERGE;