Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaa0ff15 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

fix ! versus & precedence in various places 



Fix various instances of

	if (!expr & mask)

which should probably have been

	if (!(expr & mask))

Signed-off-by: default avatarAlexey 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 551e4fb2

drivers/block/paride/pt.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static int pt_open(struct inode *inode, struct file *file) 
	pt_identify(tape);



	err = -ENODEV;

	if (!tape->flags & PT_MEDIA)

	if (!(tape->flags & PT_MEDIA))

		goto out;



	err = -EROFS;

drivers/block/pktcdvd.c

+2 −2
Original line number Diff line number Diff line
@@ -2212,11 +2212,11 @@ static int pkt_media_speed(struct pktcdvd_device *pd, unsigned *speed) 
		return ret;

	}



	if (!buf[6] & 0x40) {

	if (!(buf[6] & 0x40)) {

		printk(DRIVER_NAME": Disc type is not CD-RW\n");

		return 1;

	}

	if (!buf[6] & 0x4) {

	if (!(buf[6] & 0x4)) {

		printk(DRIVER_NAME": A1 values on media are not valid, maybe not CDRW?\n");

		return 1;

	}

drivers/isdn/act2000/module.c

+11 −11
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) 
			}

			break;

		case ISDN_CMD_DIAL:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if (!(chan = find_channel(card, c->arg & 0x0f)))

				break;
@@ -339,7 +339,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) 
			}

			return ret;

		case ISDN_CMD_ACCEPTD:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if (!(chan = find_channel(card, c->arg & 0x0f)))

				break;
@@ -347,11 +347,11 @@ act2000_command(act2000_card * card, isdn_ctrl * c) 
				actcapi_select_b2_protocol_req(card, chan);

			return 0;

		case ISDN_CMD_ACCEPTB:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			return 0;

		case ISDN_CMD_HANGUP:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if (!(chan = find_channel(card, c->arg & 0x0f)))

				break;
@@ -366,7 +366,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) 
			}

			return 0;

		case ISDN_CMD_SETEAZ:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if (!(chan = find_channel(card, c->arg & 0x0f)))

				break;
@@ -386,7 +386,7 @@ act2000_command(act2000_card * card, isdn_ctrl * c) 
			actcapi_listen_req(card);

			return 0;

		case ISDN_CMD_CLREAZ:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if (!(chan = find_channel(card, c->arg & 0x0f)))

				break;
@@ -394,14 +394,14 @@ act2000_command(act2000_card * card, isdn_ctrl * c) 
			actcapi_listen_req(card);

			return 0;

		case ISDN_CMD_SETL2:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if (!(chan = find_channel(card, c->arg & 0x0f)))

				break;

			chan->l2prot = (c->arg >> 8);

			return 0;

		case ISDN_CMD_SETL3:

			if (!card->flags & ACT2000_FLAGS_RUNNING)

			if (!(card->flags & ACT2000_FLAGS_RUNNING))

				return -ENODEV;

			if ((c->arg >> 8) != ISDN_PROTO_L3_TRANS) {

				printk(KERN_WARNING "L3 protocol unknown\n");
@@ -524,7 +524,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel) 
        act2000_card *card = act2000_findcard(id);



        if (card) {

                if (!card->flags & ACT2000_FLAGS_RUNNING)

                if (!(card->flags & ACT2000_FLAGS_RUNNING))

                        return -ENODEV;

                return (len);

        }
@@ -539,7 +539,7 @@ if_readstatus(u_char __user * buf, int len, int id, int channel) 
        act2000_card *card = act2000_findcard(id);

	

        if (card) {

                if (!card->flags & ACT2000_FLAGS_RUNNING)

                if (!(card->flags & ACT2000_FLAGS_RUNNING))

                        return -ENODEV;

                return (act2000_readstatus(buf, len, card));

        }
@@ -554,7 +554,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb) 
        act2000_card *card = act2000_findcard(id);

	

        if (card) {

                if (!card->flags & ACT2000_FLAGS_RUNNING)

                if (!(card->flags & ACT2000_FLAGS_RUNNING))

                        return -ENODEV;

		return (act2000_sendbuf(card, channel, ack, skb));

        }

drivers/isdn/i4l/isdn_ttyfax.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_info * info) 
		char *rp = &f->resolution;



		p[0] += 2;

		if (!info->faxonline & 1)	/* not outgoing connection */

		if (!(info->faxonline & 1))	/* not outgoing connection */

			PARSE_ERROR1;



		for (i = 0; (((*p[0] >= '0') && (*p[0] <= '9')) || (*p[0] == ',')) && (i < 4); i++) {

drivers/isdn/icn/icn.c

+11 −11
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_DIAL:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if (card->leased)

				break;
@@ -1328,7 +1328,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_ACCEPTD:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if (c->arg < ICN_BCH) {

				a = c->arg + 1;
@@ -1348,7 +1348,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_ACCEPTB:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if (c->arg < ICN_BCH) {

				a = c->arg + 1;
@@ -1366,7 +1366,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_HANGUP:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if (c->arg < ICN_BCH) {

				a = c->arg + 1;
@@ -1375,7 +1375,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_SETEAZ:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if (card->leased)

				break;
@@ -1391,7 +1391,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_CLREAZ:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if (card->leased)

				break;
@@ -1405,7 +1405,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_SETL2:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			if ((c->arg & 255) < ICN_BCH) {

				a = c->arg;
@@ -1424,7 +1424,7 @@ icn_command(isdn_ctrl * c, icn_card * card) 
			}

			break;

		case ISDN_CMD_SETL3:

			if (!card->flags & ICN_FLAGS_RUNNING)

			if (!(card->flags & ICN_FLAGS_RUNNING))

				return -ENODEV;

			return 0;

		default:
@@ -1471,7 +1471,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel) 
	icn_card *card = icn_findcard(id);



	if (card) {

		if (!card->flags & ICN_FLAGS_RUNNING)

		if (!(card->flags & ICN_FLAGS_RUNNING))

			return -ENODEV;

		return (icn_writecmd(buf, len, 1, card));

	}
@@ -1486,7 +1486,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel) 
	icn_card *card = icn_findcard(id);



	if (card) {

		if (!card->flags & ICN_FLAGS_RUNNING)

		if (!(card->flags & ICN_FLAGS_RUNNING))

			return -ENODEV;

		return (icn_readstatus(buf, len, card));

	}
@@ -1501,7 +1501,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb) 
	icn_card *card = icn_findcard(id);



	if (card) {

		if (!card->flags & ICN_FLAGS_RUNNING)

		if (!(card->flags & ICN_FLAGS_RUNNING))

			return -ENODEV;

		return (icn_sendbuf(channel, ack, skb, card));

	}