I am OK with the #include change, but NOT the if-statement change. But since it's bundled into one patch... Nacked-By: Mike Isely <isely@xxxxxxxxx> On Sat, 26 Mar 2011, Dan Carpenter wrote: > * Include <linux/string.h> instead of <asm/string.h>. > * Remove unneeded curly braces. > > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> > > diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c > index a5d4867..370a9ab 100644 > --- a/drivers/media/video/pvrusb2/pvrusb2-std.c > +++ b/drivers/media/video/pvrusb2/pvrusb2-std.c > @@ -20,7 +20,7 @@ > > #include "pvrusb2-std.h" > #include "pvrusb2-debug.h" > -#include <asm/string.h> > +#include <linux/string.h> > #include <linux/slab.h> > > struct std_name { > @@ -294,9 +294,8 @@ static struct v4l2_standard *match_std(v4l2_std_id id) > unsigned int idx; > > for (idx = 0; idx < generic_standards_cnt; idx++) { > - if (generic_standards[idx].id & id) { > + if (generic_standards[idx].id & id) > return generic_standards + idx; > - } > } > return NULL; > } > -- Mike Isely isely @ isely (dot) net PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html