diff options
Diffstat (limited to 'drivers/block/pktcdvd.c')
-rw-r--r-- | drivers/block/pktcdvd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 6e1daa24da2f..b72935b8f203 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -950,14 +950,14 @@ static void pkt_iosched_process_queue(struct pktcdvd_device *pd) | |||
950 | static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_queue *q) | 950 | static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_queue *q) |
951 | { | 951 | { |
952 | if ((pd->settings.size << 9) / CD_FRAMESIZE | 952 | if ((pd->settings.size << 9) / CD_FRAMESIZE |
953 | <= queue_max_phys_segments(q)) { | 953 | <= queue_max_segments(q)) { |
954 | /* | 954 | /* |
955 | * The cdrom device can handle one segment/frame | 955 | * The cdrom device can handle one segment/frame |
956 | */ | 956 | */ |
957 | clear_bit(PACKET_MERGE_SEGS, &pd->flags); | 957 | clear_bit(PACKET_MERGE_SEGS, &pd->flags); |
958 | return 0; | 958 | return 0; |
959 | } else if ((pd->settings.size << 9) / PAGE_SIZE | 959 | } else if ((pd->settings.size << 9) / PAGE_SIZE |
960 | <= queue_max_phys_segments(q)) { | 960 | <= queue_max_segments(q)) { |
961 | /* | 961 | /* |
962 | * We can handle this case at the expense of some extra memory | 962 | * We can handle this case at the expense of some extra memory |
963 | * copies during write operations | 963 | * copies during write operations |