lkml.org 
[lkml]   [2009]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] Staging: fix !x & y
    ! has a higher precedence than &

    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    ---
    diff --git a/drivers/staging/meilhaus/me1600_ao.c b/drivers/staging/meilhaus/me1600_ao.c
    index d127c6b..9ce0ee9 100644
    --- a/drivers/staging/meilhaus/me1600_ao.c
    +++ b/drivers/staging/meilhaus/me1600_ao.c
    @@ -756,7 +756,7 @@ static int me1600_ao_io_single_write(me_subdevice_t * subdevice,
    queue_delayed_work(instance->me1600_workqueue,
    &instance->ao_control_task, 1);

    - if ((!flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING) && ((instance->ao_regs_shadows)->trigger & instance->ao_idx)) { //Blocking mode. Wait for software trigger.
    + if (!(flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING) && ((instance->ao_regs_shadows)->trigger & instance->ao_idx)) { //Blocking mode. Wait for software trigger.
    if (time_out) {
    delay = (time_out * HZ) / 1000;
    if (delay == 0)
    diff --git a/drivers/staging/meilhaus/me4600_ao.c b/drivers/staging/meilhaus/me4600_ao.c
    index e2bec82..2571caf 100644
    --- a/drivers/staging/meilhaus/me4600_ao.c
    +++ b/drivers/staging/meilhaus/me4600_ao.c
    @@ -1025,7 +1025,7 @@ static int me4600_ao_io_stream_config(me_subdevice_t * subdevice,
    }

    if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
    - if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
    + if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
    PERROR
    ("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
    return ME_ERRNO_INVALID_FLAGS;
    diff --git a/drivers/staging/meilhaus/me6000_ao.c b/drivers/staging/meilhaus/me6000_ao.c
    index 94f0123..e1c94cb 100644
    --- a/drivers/staging/meilhaus/me6000_ao.c
    +++ b/drivers/staging/meilhaus/me6000_ao.c
    @@ -1063,7 +1063,7 @@ static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
    }

    if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
    - if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
    + if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
    PERROR
    ("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
    return ME_ERRNO_INVALID_FLAGS;
    diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
    index 3ea2b2c..2f14840 100644
    --- a/drivers/staging/rt2860/sta_ioctl.c
    +++ b/drivers/staging/rt2860/sta_ioctl.c
    @@ -1756,7 +1756,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
    }
    else
    /* Don't complain if only change the mode */
    - if(!erq->flags & IW_ENCODE_MODE) {
    + if(!(erq->flags & IW_ENCODE_MODE)) {
    return -EINVAL;
    }
    }
    diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
    index 91f0fab..2f5bd91 100644
    --- a/drivers/staging/rt2870/sta_ioctl.c
    +++ b/drivers/staging/rt2870/sta_ioctl.c
    @@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
    }
    else
    /* Don't complain if only change the mode */
    - if(!erq->flags & IW_ENCODE_MODE) {
    + if(!(erq->flags & IW_ENCODE_MODE)) {
    return -EINVAL;
    }
    }
    diff --git a/drivers/staging/rt2870/tmp60 b/drivers/staging/rt2870/tmp60
    index 975e444..eb50243 100644
    --- a/drivers/staging/rt2870/tmp60
    +++ b/drivers/staging/rt2870/tmp60
    @@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
    }
    else
    /* Don't complain if only change the mode */
    - if(!erq->flags & IW_ENCODE_MODE) {
    + if(!(erq->flags & IW_ENCODE_MODE)) {
    return -EINVAL;
    }
    }
    diff --git a/drivers/staging/rt2870/tmp61 b/drivers/staging/rt2870/tmp61
    index 975e444..eb50243 100644
    --- a/drivers/staging/rt2870/tmp61
    +++ b/drivers/staging/rt2870/tmp61
    @@ -1776,7 +1776,7 @@ int rt_ioctl_siwencode(struct net_device *dev,
    }
    else
    /* Don't complain if only change the mode */
    - if(!erq->flags & IW_ENCODE_MODE) {
    + if(!(erq->flags & IW_ENCODE_MODE)) {
    return -EINVAL;
    }
    }
    diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
    index 9453495..be4a8a1 100644
    --- a/drivers/staging/rtl8187se/r8180_core.c
    +++ b/drivers/staging/rtl8187se/r8180_core.c
    @@ -3161,7 +3161,7 @@ void rtl8180_prepare_beacon(struct net_device *dev)
    return ;

    }
    - //while(! *tail & (1<<31)){
    + //while(!(*tail & (1<<31))){
    *tail= 0; // zeroes header

    *tail = *tail| (1<<29) ; //fist segment of the packet

    \
     
     \ /
      Last update: 2009-01-17 16:51    [W:0.025 / U:1.420 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site