diff options
author | Gerhard Dirschl <gd@spherenet.de> | 2007-02-20 16:57:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 20:10:14 -0500 |
commit | 91e4ee381d23ef67196a03924485aeceb32d6753 (patch) | |
tree | 191dee4494c176fd6cf08edb2cdab36fe8f422a5 | |
parent | 1df49008f4ddec9d4f6862b47ea5bdba82078aa4 (diff) |
[PATCH] pktcdvd: Correctly set cmd_len field in pkt_generic_packet
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7810 - a silly
copy-paste bug introduced by the latest change.
Signed-off-by: Gerhard Dirschl <gd@spherenet.de>
Cc: Peter Osterlund <petero2@telia.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/block/pktcdvd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 93fb6ed4ed52..a4fb70383188 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -765,7 +765,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command * | |||
765 | goto out; | 765 | goto out; |
766 | } | 766 | } |
767 | 767 | ||
768 | rq->cmd_len = COMMAND_SIZE(rq->cmd[0]); | 768 | rq->cmd_len = COMMAND_SIZE(cgc->cmd[0]); |
769 | memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE); | 769 | memcpy(rq->cmd, cgc->cmd, CDROM_PACKET_SIZE); |
770 | if (sizeof(rq->cmd) > CDROM_PACKET_SIZE) | 770 | if (sizeof(rq->cmd) > CDROM_PACKET_SIZE) |
771 | memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE); | 771 | memset(rq->cmd + CDROM_PACKET_SIZE, 0, sizeof(rq->cmd) - CDROM_PACKET_SIZE); |