diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-02-06 04:36:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:40:59 -0500 |
commit | eaa0ff15c30dc9799eb4d12660edb73aeb6d32c5 (patch) | |
tree | 592ea2010b2e6fb2951e78c21dafc4c2e6fe2134 /drivers/block | |
parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) |
fix ! versus & precedence in various places
Fix various instances of
if (!expr & mask)
which should probably have been
if (!(expr & mask))
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Peter Osterlund <petero2@telia.com>
Cc: Karsten Keil <kkeil@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/paride/pt.c | 2 | ||||
-rw-r--r-- | drivers/block/pktcdvd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index 76096cad798f..8b9549ab4a4e 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c | |||
@@ -660,7 +660,7 @@ static int pt_open(struct inode *inode, struct file *file) | |||
660 | pt_identify(tape); | 660 | pt_identify(tape); |
661 | 661 | ||
662 | err = -ENODEV; | 662 | err = -ENODEV; |
663 | if (!tape->flags & PT_MEDIA) | 663 | if (!(tape->flags & PT_MEDIA)) |
664 | goto out; | 664 | goto out; |
665 | 665 | ||
666 | err = -EROFS; | 666 | err = -EROFS; |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index e9de1712e5a0..674cd66dcaba 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -2212,11 +2212,11 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed) | |||
2212 | return ret; | 2212 | return ret; |
2213 | } | 2213 | } |
2214 | 2214 | ||
2215 | if (!buf[6] & 0x40) { | 2215 | if (!(buf[6] & 0x40)) { |
2216 | printk(DRIVER_NAME": Disc type is not CD-RW\n"); | 2216 | printk(DRIVER_NAME": Disc type is not CD-RW\n"); |
2217 | return 1; | 2217 | return 1; |
2218 | } | 2218 | } |
2219 | if (!buf[6] & 0x4) { | 2219 | if (!(buf[6] & 0x4)) { |
2220 | printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n"); | 2220 | printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n"); |
2221 | return 1; | 2221 | return 1; |
2222 | } | 2222 | } |