Commit a50f92a6 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] Several logic bugs.

Lots of patches from Norbert Kiesel that fix up several silly
 | vs. || and & vs. && bugs found with
	find ${1:-.} -name \*.c | xargs grep -En \
	 '![a-zA-Z0-9_ ]+(\|[^|]|\&[^&])|([^|]\||[^&]\&) *!'
parent 46f2cb79
...@@ -221,7 +221,7 @@ dvb_dmx_swfilter_sectionfilter(struct dvb_demux_feed *dvbdmxfeed, ...@@ -221,7 +221,7 @@ dvb_dmx_swfilter_sectionfilter(struct dvb_demux_feed *dvbdmxfeed,
return 0; return 0;
neq|=f->maskandnotmode[i]&xor; neq|=f->maskandnotmode[i]&xor;
} }
if (f->doneq & !neq) if (f->doneq && !neq)
return 0; return 0;
return dvbdmxfeed->cb.sec(dvbdmxfeed->secbuf, dvbdmxfeed->seclen, return dvbdmxfeed->cb.sec(dvbdmxfeed->secbuf, dvbdmxfeed->seclen,
......
...@@ -322,7 +322,7 @@ static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node ...@@ -322,7 +322,7 @@ static int __pnp_bios_get_dev_node(u8 *nodenum, char boot, struct pnp_bios_node
u16 status; u16 status;
if (!pnp_bios_present()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
if ( !boot & pnpbios_dont_use_current_config ) if ( !boot && pnpbios_dont_use_current_config )
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
status = call_pnp_bios(PNP_GET_SYS_DEV_NODE, 0, PNP_TS1, 0, PNP_TS2, boot ? 2 : 1, PNP_DS, 0, status = call_pnp_bios(PNP_GET_SYS_DEV_NODE, 0, PNP_TS1, 0, PNP_TS2, boot ? 2 : 1, PNP_DS, 0,
nodenum, sizeof(char), data, 65536); nodenum, sizeof(char), data, 65536);
...@@ -350,7 +350,7 @@ static int __pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node * ...@@ -350,7 +350,7 @@ static int __pnp_bios_set_dev_node(u8 nodenum, char boot, struct pnp_bios_node *
u16 status; u16 status;
if (!pnp_bios_present()) if (!pnp_bios_present())
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
if ( !boot & pnpbios_dont_use_current_config ) if ( !boot && pnpbios_dont_use_current_config )
return PNP_FUNCTION_NOT_SUPPORTED; return PNP_FUNCTION_NOT_SUPPORTED;
status = call_pnp_bios(PNP_SET_SYS_DEV_NODE, nodenum, 0, PNP_TS1, boot ? 2 : 1, PNP_DS, 0, 0, status = call_pnp_bios(PNP_SET_SYS_DEV_NODE, nodenum, 0, PNP_TS1, boot ? 2 : 1, PNP_DS, 0, 0,
data, 65536, 0, 0); data, 65536, 0, 0);
......
...@@ -235,8 +235,8 @@ static void uart00_modem_status(struct uart_port *port) ...@@ -235,8 +235,8 @@ static void uart00_modem_status(struct uart_port *port)
status = UART_GET_MSR(port); status = UART_GET_MSR(port);
if (!status & (UART_MSR_DCTS_MSK | UART_MSR_DDSR_MSK | if (!(status & (UART_MSR_DCTS_MSK | UART_MSR_DDSR_MSK |
UART_MSR_TERI_MSK | UART_MSR_DDCD_MSK)) UART_MSR_TERI_MSK | UART_MSR_DDCD_MSK)))
return; return;
if (status & UART_MSR_DDCD_MSK) if (status & UART_MSR_DDCD_MSK)
......
...@@ -456,7 +456,7 @@ void accel_clear_margins(struct vc_data *vc, struct display *p, ...@@ -456,7 +456,7 @@ void accel_clear_margins(struct vc_data *vc, struct display *p,
region.color = attr_bgcol_ec(p, vc); region.color = attr_bgcol_ec(p, vc);
region.rop = ROP_COPY; region.rop = ROP_COPY;
if (rw & !bottom_only) { if (rw && !bottom_only) {
region.dx = info->var.xoffset + rs; region.dx = info->var.xoffset + rs;
region.dy = 0; region.dy = 0;
region.width = rw; region.width = rw;
......
...@@ -179,7 +179,7 @@ static int gus_midi_buffer_status(int dev) ...@@ -179,7 +179,7 @@ static int gus_midi_buffer_status(int dev)
qhead++; qhead++;
} }
spin_unlock_irqrestore(&lock,flags); spin_unlock_irqrestore(&lock,flags);
return (qlen > 0) | !(GUS_MIDI_STATUS() & MIDI_XMIT_EMPTY); return (qlen > 0) || !(GUS_MIDI_STATUS() & MIDI_XMIT_EMPTY);
} }
#define MIDI_SYNTH_NAME "Gravis Ultrasound Midi" #define MIDI_SYNTH_NAME "Gravis Ultrasound Midi"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment