Commit 360a63c8 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman

staging: i4l: act2000: do not assign in if

It is not the kernel coding style to assign values to some variable in
if statement. Split them up into different statements.
Signed-off-by: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c78f701
...@@ -31,7 +31,8 @@ act2000_isa_reset(unsigned short portbase) ...@@ -31,7 +31,8 @@ act2000_isa_reset(unsigned short portbase)
int serial = 0; int serial = 0;
found = 0; found = 0;
if ((reg = inb(portbase + ISA_COR)) != 0xff) { reg = inb(portbase + ISA_COR);
if (reg != 0xff) {
outb(reg | ISA_COR_RESET, portbase + ISA_COR); outb(reg | ISA_COR_RESET, portbase + ISA_COR);
mdelay(10); mdelay(10);
outb(reg, portbase + ISA_COR); outb(reg, portbase + ISA_COR);
...@@ -303,7 +304,8 @@ act2000_isa_send(act2000_card *card) ...@@ -303,7 +304,8 @@ act2000_isa_send(act2000_card *card)
while (1) { while (1) {
spin_lock_irqsave(&card->lock, flags); spin_lock_irqsave(&card->lock, flags);
if (!(card->sbuf)) { if (!(card->sbuf)) {
if ((card->sbuf = skb_dequeue(&card->sndq))) { card->sbuf = skb_dequeue(&card->sndq);
if (card->sbuf) {
card->ack_msg = card->sbuf->data; card->ack_msg = card->sbuf->data;
msg = (actcapi_msg *)card->sbuf->data; msg = (actcapi_msg *)card->sbuf->data;
if ((msg->hdr.cmd.cmd == 0x86) && if ((msg->hdr.cmd.cmd == 0x86) &&
...@@ -378,7 +380,8 @@ act2000_isa_getid(act2000_card *card) ...@@ -378,7 +380,8 @@ act2000_isa_getid(act2000_card *card)
printk(KERN_WARNING "act2000: Wrong Firmware-ID!\n"); printk(KERN_WARNING "act2000: Wrong Firmware-ID!\n");
return -EPROTO; return -EPROTO;
} }
if ((p = strchr(fid.revision, '\n'))) p = strchr(fid.revision, '\n');
if (p)
*p = '\0'; *p = '\0';
printk(KERN_INFO "act2000: Firmware-ID: %s\n", fid.revision); printk(KERN_INFO "act2000: Firmware-ID: %s\n", fid.revision);
if (card->flags & ACT2000_FLAGS_IVALID) { if (card->flags & ACT2000_FLAGS_IVALID) {
......
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