diff for duplicates of <20100601081519.GK5483@bicker> diff --git a/a/1.txt b/N1/1.txt index e6ad542..ca89f40 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ index 5d91f70..2e3ea0f 100644 int dvb_usb_debug; -module_param_named(debug,dvb_usb_debug, int, 0644); +module_param_named(debug, dvb_usb_debug, int, 0644); - MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8,err\x16,rc2,fwd,mem\x128,uxfer%6 (or-able))." DVB_USB_DEBUG_STATUS); + MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64,mem=128,uxfer=256 (or-able))." DVB_USB_DEBUG_STATUS); int dvb_usb_disable_rc_polling; @@ -29,7 +29,7 @@ MODULE_PARM_DESC(force_pid_filter_usage, "force all dvb-usb-devices to use a PID @@ -32,12 +32,12 @@ index 5d91f70..2e3ea0f 100644 -/* speed - when running at FULL speed we need a HW PID filter */ + /* speed - when running at FULL speed we need a HW PID filter */ - if (d->udev->speed = USB_SPEED_FULL && !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) { + if (d->udev->speed == USB_SPEED_FULL && !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) { err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)"); return -ENODEV; @@ -46,7 +46,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) - if ((d->udev->speed = USB_SPEED_FULL && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) || + if ((d->udev->speed == USB_SPEED_FULL && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) || (adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) { - info("will use the device's hardware PID filter (table count: %d).",adap->props.pid_filter_count); + info("will use the device's hardware PID filter (table count: %d).", adap->props.pid_filter_count); @@ -50,7 +50,7 @@ index 5d91f70..2e3ea0f 100644 if (adap->props.size_of_priv > 0) { - adap->priv = kzalloc(adap->props.size_of_priv,GFP_KERNEL); + adap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL); - if (adap->priv = NULL) { + if (adap->priv == NULL) { - err("no memory for priv for adapter %d.",n); + err("no memory for priv for adapter %d.", n); return -ENOMEM; @@ -95,7 +95,7 @@ index 5d91f70..2e3ea0f 100644 if (d->props.size_of_priv > 0) { - d->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL); + d->priv = kzalloc(d->props.size_of_priv, GFP_KERNEL); - if (d->priv = NULL) { + if (d->priv == NULL) { err("no memory for priv in 'struct dvb_usb_device'"); return -ENOMEM; } @@ -124,8 +124,8 @@ index 5d91f70..2e3ea0f 100644 for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].cold_ids[j] != NULL; j++) { - deb_info("check for cold %x %x\n",props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct); + deb_info("check for cold %x %x\n", props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct); - if (props->devices[i].cold_ids[j]->idVendor = le16_to_cpu(udev->descriptor.idVendor) && - props->devices[i].cold_ids[j]->idProduct = le16_to_cpu(udev->descriptor.idProduct)) { + if (props->devices[i].cold_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) && + props->devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) { *cold = 1; @@ -179,7 +181,7 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device break; @@ -133,8 +133,8 @@ index 5d91f70..2e3ea0f 100644 for (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].warm_ids[j] != NULL; j++) { - deb_info("check for warm %x %x\n",props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct); + deb_info("check for warm %x %x\n", props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct); - if (props->devices[i].warm_ids[j]->idVendor = le16_to_cpu(udev->descriptor.idVendor) && - props->devices[i].warm_ids[j]->idProduct = le16_to_cpu(udev->descriptor.idProduct)) { + if (props->devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) && + props->devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) { *cold = 0; @@ -190,7 +192,7 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device } @@ -149,8 +149,8 @@ index 5d91f70..2e3ea0f 100644 else d->powered--; -- if (d->powered = 0 || (onoff && d->powered = 1)) { // when switching from 1 to 0 or from 0 to 1 -+ if (d->powered = 0 || (onoff && d->powered = 1)) { /* when switching from 1 to 0 or from 0 to 1 */ +- if (d->powered == 0 || (onoff && d->powered == 1)) { // when switching from 1 to 0 or from 0 to 1 ++ if (d->powered == 0 || (onoff && d->powered == 1)) { /* when switching from 1 to 0 or from 0 to 1 */ deb_info("power control: %d\n", onoff); if (d->props.power_ctrl) return d->props.power_ctrl(d, onoff); @@ -164,8 +164,8 @@ index 5d91f70..2e3ea0f 100644 if (du != NULL) *du = NULL; -- if ((desc = dvb_usb_find_device(udev,props,&cold)) = NULL) { -+ if ((desc = dvb_usb_find_device(udev, props, &cold)) = NULL) { +- if ((desc = dvb_usb_find_device(udev,props,&cold)) == NULL) { ++ if ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) { deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n"); return -ENODEV; } @@ -183,7 +183,7 @@ index 5d91f70..2e3ea0f 100644 - d = kzalloc(sizeof(struct dvb_usb_device),GFP_KERNEL); + info("found a '%s' in warm state.", desc->name); + d = kzalloc(sizeof(struct dvb_usb_device), GFP_KERNEL); - if (d = NULL) { + if (d == NULL) { err("no memory for 'struct dvb_usb_device'"); return -ENOMEM; } @@ -197,7 +197,7 @@ index 5d91f70..2e3ea0f 100644 @@ -259,9 +261,9 @@ int dvb_usb_device_init(struct usb_interface *intf, ret = dvb_usb_init(d, adapter_nums); - if (ret = 0) + if (ret == 0) - info("%s successfully initialized and connected.",desc->name); + info("%s successfully initialized and connected.", desc->name); else diff --git a/a/content_digest b/N1/content_digest index 39cfe35..80aad1a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] V4L/DVB: white space changes in dvb-usb-init.c\0" - "Date\0Tue, 01 Jun 2010 08:15:19 +0000\0" + "Date\0Tue, 1 Jun 2010 10:15:19 +0200\0" "To\0Mauro Carvalho Chehab <mchehab@redhat.com>\0" "Cc\0linux-media@vger.kernel.org" " kernel-janitors@vger.kernel.org\0" @@ -22,7 +22,7 @@ " int dvb_usb_debug;\n" "-module_param_named(debug,dvb_usb_debug, int, 0644);\n" "+module_param_named(debug, dvb_usb_debug, int, 0644);\n" - " MODULE_PARM_DESC(debug, \"set debugging level (1=info,xfer=2,pll=4,ts=8,err\026,rc2,fwd,mem\0228,uxfer%6 (or-able)).\" DVB_USB_DEBUG_STATUS);\n" + " MODULE_PARM_DESC(debug, \"set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64,mem=128,uxfer=256 (or-able)).\" DVB_USB_DEBUG_STATUS);\n" " \n" " int dvb_usb_disable_rc_polling;\n" "@@ -29,7 +29,7 @@ MODULE_PARM_DESC(force_pid_filter_usage, \"force all dvb-usb-devices to use a PID\n" @@ -40,12 +40,12 @@ " \n" "-/* speed - when running at FULL speed we need a HW PID filter */\n" "+\t\t/* speed - when running at FULL speed we need a HW PID filter */\n" - " \t\tif (d->udev->speed = USB_SPEED_FULL && !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {\n" + " \t\tif (d->udev->speed == USB_SPEED_FULL && !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {\n" " \t\t\terr(\"This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)\");\n" " \t\t\treturn -ENODEV;\n" "@@ -46,7 +46,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)\n" " \n" - " \t\tif ((d->udev->speed = USB_SPEED_FULL && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||\n" + " \t\tif ((d->udev->speed == USB_SPEED_FULL && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||\n" " \t\t\t(adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {\n" "-\t\t\tinfo(\"will use the device's hardware PID filter (table count: %d).\",adap->props.pid_filter_count);\n" "+\t\t\tinfo(\"will use the device's hardware PID filter (table count: %d).\", adap->props.pid_filter_count);\n" @@ -58,7 +58,7 @@ " \t\tif (adap->props.size_of_priv > 0) {\n" "-\t\t\tadap->priv = kzalloc(adap->props.size_of_priv,GFP_KERNEL);\n" "+\t\t\tadap->priv = kzalloc(adap->props.size_of_priv, GFP_KERNEL);\n" - " \t\t\tif (adap->priv = NULL) {\n" + " \t\t\tif (adap->priv == NULL) {\n" "-\t\t\t\terr(\"no memory for priv for adapter %d.\",n);\n" "+\t\t\t\terr(\"no memory for priv for adapter %d.\", n);\n" " \t\t\t\treturn -ENOMEM;\n" @@ -103,7 +103,7 @@ " \tif (d->props.size_of_priv > 0) {\n" "-\t\td->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL);\n" "+\t\td->priv = kzalloc(d->props.size_of_priv, GFP_KERNEL);\n" - " \t\tif (d->priv = NULL) {\n" + " \t\tif (d->priv == NULL) {\n" " \t\t\terr(\"no memory for priv in 'struct dvb_usb_device'\");\n" " \t\t\treturn -ENOMEM;\n" " \t\t}\n" @@ -132,8 +132,8 @@ " \t\tfor (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].cold_ids[j] != NULL; j++) {\n" "-\t\t\tdeb_info(\"check for cold %x %x\\n\",props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct);\n" "+\t\t\tdeb_info(\"check for cold %x %x\\n\", props->devices[i].cold_ids[j]->idVendor, props->devices[i].cold_ids[j]->idProduct);\n" - " \t\t\tif (props->devices[i].cold_ids[j]->idVendor = le16_to_cpu(udev->descriptor.idVendor) &&\n" - " \t\t\t\tprops->devices[i].cold_ids[j]->idProduct = le16_to_cpu(udev->descriptor.idProduct)) {\n" + " \t\t\tif (props->devices[i].cold_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&\n" + " \t\t\t\tprops->devices[i].cold_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {\n" " \t\t\t\t*cold = 1;\n" "@@ -179,7 +181,7 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device\n" " \t\t\tbreak;\n" @@ -141,8 +141,8 @@ " \t\tfor (j = 0; j < DVB_USB_ID_MAX_NUM && props->devices[i].warm_ids[j] != NULL; j++) {\n" "-\t\t\tdeb_info(\"check for warm %x %x\\n\",props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct);\n" "+\t\t\tdeb_info(\"check for warm %x %x\\n\", props->devices[i].warm_ids[j]->idVendor, props->devices[i].warm_ids[j]->idProduct);\n" - " \t\t\tif (props->devices[i].warm_ids[j]->idVendor = le16_to_cpu(udev->descriptor.idVendor) &&\n" - " \t\t\t\tprops->devices[i].warm_ids[j]->idProduct = le16_to_cpu(udev->descriptor.idProduct)) {\n" + " \t\t\tif (props->devices[i].warm_ids[j]->idVendor == le16_to_cpu(udev->descriptor.idVendor) &&\n" + " \t\t\t\tprops->devices[i].warm_ids[j]->idProduct == le16_to_cpu(udev->descriptor.idProduct)) {\n" " \t\t\t\t*cold = 0;\n" "@@ -190,7 +192,7 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device\n" " \t}\n" @@ -157,8 +157,8 @@ " \telse\n" " \t\td->powered--;\n" " \n" - "-\tif (d->powered = 0 || (onoff && d->powered = 1)) { // when switching from 1 to 0 or from 0 to 1\n" - "+\tif (d->powered = 0 || (onoff && d->powered = 1)) { /* when switching from 1 to 0 or from 0 to 1 */\n" + "-\tif (d->powered == 0 || (onoff && d->powered == 1)) { // when switching from 1 to 0 or from 0 to 1\n" + "+\tif (d->powered == 0 || (onoff && d->powered == 1)) { /* when switching from 1 to 0 or from 0 to 1 */\n" " \t\tdeb_info(\"power control: %d\\n\", onoff);\n" " \t\tif (d->props.power_ctrl)\n" " \t\t\treturn d->props.power_ctrl(d, onoff);\n" @@ -172,8 +172,8 @@ " \tif (du != NULL)\n" " \t\t*du = NULL;\n" " \n" - "-\tif ((desc = dvb_usb_find_device(udev,props,&cold)) = NULL) {\n" - "+\tif ((desc = dvb_usb_find_device(udev, props, &cold)) = NULL) {\n" + "-\tif ((desc = dvb_usb_find_device(udev,props,&cold)) == NULL) {\n" + "+\tif ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) {\n" " \t\tdeb_err(\"something went very wrong, device was not found in current device list - let's see what comes next.\\n\");\n" " \t\treturn -ENODEV;\n" " \t}\n" @@ -191,7 +191,7 @@ "-\t\td = kzalloc(sizeof(struct dvb_usb_device),GFP_KERNEL);\n" "+\tinfo(\"found a '%s' in warm state.\", desc->name);\n" "+\td = kzalloc(sizeof(struct dvb_usb_device), GFP_KERNEL);\n" - " \tif (d = NULL) {\n" + " \tif (d == NULL) {\n" " \t\terr(\"no memory for 'struct dvb_usb_device'\");\n" " \t\treturn -ENOMEM;\n" " \t}\n" @@ -205,7 +205,7 @@ "@@ -259,9 +261,9 @@ int dvb_usb_device_init(struct usb_interface *intf,\n" " \tret = dvb_usb_init(d, adapter_nums);\n" " \n" - " \tif (ret = 0)\n" + " \tif (ret == 0)\n" "-\t\tinfo(\"%s successfully initialized and connected.\",desc->name);\n" "+\t\tinfo(\"%s successfully initialized and connected.\", desc->name);\n" " \telse\n" @@ -230,4 +230,4 @@ " }\n" EXPORT_SYMBOL(dvb_usb_device_exit); -f12f4630742d3174b24b68127cfefeb7bdd4ee7dd4a24c79d5914b3f89654439 +2af8a2ff20d87d7b3bf1610076d87f1ab71513e8310d74d5c4fe22f3d3e421a3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.