From 87246e5b2bf6fc6584f02b86ad8f8d67c20f4f0f Mon Sep 17 00:00:00 2001 From: Phillip Susi Date: Sat, 4 Feb 2006 23:27:44 -0800 Subject: [PATCH] --- yaml --- r: 19796 b: refs/heads/master c: a460ad62260def15c42130de253d6cfc32528a2f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/pktcdvd.c | 2 +- trunk/include/linux/pktcdvd.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f05f5259c16c..a4502afb28a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd576c9523fbf23e94fb7dbe05d2ae1cf96864e4 +refs/heads/master: a460ad62260def15c42130de253d6cfc32528a2f diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c index 93affeeef7bd..d95e7e1ac355 100644 --- a/trunk/drivers/block/pktcdvd.c +++ b/trunk/drivers/block/pktcdvd.c @@ -1639,7 +1639,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd) pd->settings.size = be32_to_cpu(ti.fixed_packet_size) << 2; if (pd->settings.size == 0) { printk("pktcdvd: detected zero packet size!\n"); - pd->settings.size = 128; + return -ENXIO; } if (pd->settings.size > PACKET_MAX_SECTORS) { printk("pktcdvd: packet size is too big\n"); diff --git a/trunk/include/linux/pktcdvd.h b/trunk/include/linux/pktcdvd.h index 2c177e4c8f22..d1c9c4a86e52 100644 --- a/trunk/include/linux/pktcdvd.h +++ b/trunk/include/linux/pktcdvd.h @@ -114,7 +114,7 @@ struct pkt_ctrl_command { struct packet_settings { - __u8 size; /* packet size in (512 byte) sectors */ + __u32 size; /* packet size in (512 byte) sectors */ __u8 fp; /* fixed packets */ __u8 link_loss; /* the rest is specified * as per Mt Fuji */