| From stable-bounces@linux.kernel.org Mon Feb 12 21:34:07 2007 |
| From: Gerhard Dirschl <gd@spherenet.de> |
| Date: Mon, 12 Feb 2007 21:32:43 -0800 |
| Subject: pktcdvd: Correctly set cmd_len field in pkt_generic_packet |
| To: mm-commits@vger.kernel.org |
| Cc: petero2@telia.com, stable@kernel.org, gd@spherenet.de |
| Message-ID: <200702130532.l1D5Wh5H022691@shell0.pdx.osdl.net> |
| |
| |
| From: Gerhard Dirschl <gd@spherenet.de> |
| |
| 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> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/block/pktcdvd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- linux-2.6.20.1.orig/drivers/block/pktcdvd.c |
| +++ linux-2.6.20.1/drivers/block/pktcdvd.c |
| @@ -777,7 +777,7 @@ static int pkt_generic_packet(struct pkt |
| goto out; |
| } |
| |
| - rq->cmd_len = COMMAND_SIZE(rq->cmd[0]); |
| + rq->cmd_len = COMMAND_SIZE(cgc->cmd[0]); |
| 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); |