fix not-and/or errors]
A message that is not in the archive (sent off-list or not yet received): 1192709005.4862.31.camel@gaivota
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mauro Carvalho Chehab
Acked-byRoel,
Em Qui, 2007-10-18 às 23:20 -0500, Mike Isely escreveu:
Quoted 6 lines
Regarding the pvrusb2 part of the patch:
Yup, that's definitely a bug. Good catch. The correct fix is the one in the patch.
Reviewed-by Mike Isely <[email protected]>
Regarding to pvrusb2 driver:
Quoted 152 lines
-Mike
Quoted 145 lines · Mauro Carvalho Chehab
Mike,
Please take a look on this patch.
Cheers,
Mauro.
-------- Mensagem encaminhada --------
De: Roel Kluin <[email protected]>
Para: lkml <[email protected]>
Assunto: [PATCH 1/4] fix not-and/or errors
Data: Wed, 17 Oct 2007 15:46:43 +0200
if(!x & y)should either beif(!(x & y))orif(!x && y)
I made changes as seemed appropriate, but please review this is against current git.Signed-off-by Roel Kluin <[email protected]>---
drivers/media/video/pvrusb2/pvrusb2-ctrl.c +1
-1@@ -410,7 +410,7 @@ static int parse_mtoken(const char *ptr,unsigned int len,int msk; *valptr =0 ;for (idx =0 , msk =1 ; valid_bits; idx++, msk <<=1 ) { -if (!msk & valid_bits)continue ; +if (!(msk & valid_bits))continue ; valid_bits &= ~msk;if (!names[idx])continue ; slen =strlen (names[idx]);drivers/misc/asus-laptop.c +1
-1@@ -322,7 +322,7 @@ static void write_status(acpi_handle handle, int out, int mask)switch (mask) {case MLED_ON : - out = !out &0x1 ; + out = !(out &0x1 );break ;case GLED_ON : out = (out &0x1 ) +1 ;drivers/s390/cio/cmf.c +2
-2@@ -343,10 +343,10 @@ static int cmf_copy_block(struct ccw_device *cdev)if (sch->schib.scsw.fctl &SCSW_FCTL_START_FUNC ) {/* Don't copy if a start function is in progress. */ -if ((!sch->schib.scsw.actl &SCSW_ACTL_SUSPENDED ) && +if ((!(sch->schib.scsw.actl &SCSW_ACTL_SUSPENDED )) && (sch->schib.scsw.actl & (SCSW_ACTL_DEVACT |SCSW_ACTL_SCHACT )) && - (!sch->schib.scsw.stctl &SCSW_STCTL_SEC_STATUS )) + (!(sch->schib.scsw.stctl &SCSW_STCTL_SEC_STATUS )))return -EBUSY ; } cmb_data = cdev->private->cmb;drivers/scsi/st.c +1
-1@@ -2882,7 +2882,7 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon !(STp->use_pf & PF_TESTED)) {/* Try the other possible state of Page Format if not already tried */ - STp->use_pf = !STp->use_pf |PF_TESTED ; + STp->use_pf = !(STp->use_pf |PF_TESTED );st_release_request (SRpnt); SRpnt =NULL ;return st_int_ioctl (STp, cmd_in, arg);drivers/usb/core/hub.c +1
-1@@ -335,7 +335,7 @@ static void kick_khubd(struct usb_hub *hub)to_usb_interface (hub->intfdev)->pm_usage_cnt =1 ;spin_lock_irqsave (&hub_event_lock, flags); -if (!hub->disconnected &list_empty (&hub->event_list)) { +if (!hub->disconnected &&list_empty (&hub->event_list)) {list_add_tail (&hub->event_list, &hub_event_list);wake_up (&khubd_wait); }drivers/video/i810/i810_main.c +1
-1@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)struct i810fb_par *par = info->par;u8 __iomem *mmio = par->mmio_start_virtual; -if (!par->dev_flags &LOCKUP ) +if (!(par->dev_flags &LOCKUP ))return -ENXIO ;if (cursor->image.width >64 || cursor->image.height >64 )fs/ocfs2/alloc.c +1
-1@@ -3946,7 +3946,7 @@ static int __ocfs2_mark_extent_written(struct inode *inode,struct ocfs2_merge_ctxt ctxt;struct ocfs2_extent_list *rightmost_el; -if (!rec->e_flags &OCFS2_EXT_UNWRITTEN ) { +if (!(rec->e_flags &OCFS2_EXT_UNWRITTEN )) { ret = -EIO ;mlog_errno (ret); goto out;fs/ocfs2/dlmglue.c +1
-1@@ -670,7 +670,7 @@ static inline void ocfs2_generic_handle_attach_action(struct ocfs2_lock_res *loc {mlog_entry_void (); -BUG_ON ((!lockres->l_flags &OCFS2_LOCK_BUSY )); +BUG_ON ((!(lockres->l_flags &OCFS2_LOCK_BUSY )));BUG_ON (lockres->l_flags &OCFS2_LOCK_ATTACHED ); if (lockres->l_requested > LKM_NLMODE &&net/ieee80211/ieee80211_wx.c +1
-2@@ -709,7 +709,7 @@ int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, }else idx = ieee->tx_keyidx; -if (!ext->ext_flags &IW_ENCODE_EXT_GROUP_KEY && +if (!(ext->ext_flags &IW_ENCODE_EXT_GROUP_KEY ) && ext->alg !=IW_ENCODE_ALG_WEP )if (idx !=0 || ieee->iw_mode !=IW_MODE_INFRA )return -EINVAL ; -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
Cheers, Mauro