From: Benoit Boissinot is not equivalent with morgan's law. Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton --- drivers/cdrom/cdrom.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/cdrom/cdrom.c~cleanup-cdrom_ioctl-fix drivers/cdrom/cdrom.c --- devel/drivers/cdrom/cdrom.c~cleanup-cdrom_ioctl-fix 2006-01-14 15:50:25.000000000 -0800 +++ devel-akpm/drivers/cdrom/cdrom.c 2006-01-14 15:50:25.000000000 -0800 @@ -2586,7 +2586,7 @@ static int cdrom_ioctl_read_tocentry(str return -EFAULT; requested_format = entry.cdte_format; - if (requested_format != CDROM_MSF || requested_format != CDROM_LBA) + if (requested_format != CDROM_MSF && requested_format != CDROM_LBA) return -EINVAL; /* make interface to low-level uniform */ entry.cdte_format = CDROM_MSF; _