diff for duplicates of <d19fb3b4-e73f-a225-ce8e-a8b6ebba0b4d@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index c04d0c6..48704af 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,9 +16,9 @@ index ffbbb74..132c8cf 100644 @@ -227,10 +227,10 @@ static void iowarrior_write_callback(struct urb *urb) /* sync/async unlink faults aren't errors */ if (status && - !(status = -ENOENT || -- status = -ECONNRESET || status = -ESHUTDOWN)) { -+ status = -ECONNRESET || status = -ESHUTDOWN)) + !(status == -ENOENT || +- status == -ECONNRESET || status == -ESHUTDOWN)) { ++ status == -ECONNRESET || status == -ESHUTDOWN)) dev_dbg(&dev->interface->dev, "nonzero write bulk status received: %d\n", status); - } @@ -28,7 +28,8 @@ index ffbbb74..132c8cf 100644 urb->transfer_buffer, urb->transfer_dma); @@ -304,25 +304,21 @@ static ssize_t iowarrior_read(struct file *file, char __user *buffer, read_index - (dev)) ! -1)); + (dev)) != + -1)); - if (r) { + if (r) //we were interrupted by a signal @@ -39,8 +40,8 @@ index ffbbb74..132c8cf 100644 //The device was unplugged return -ENODEV; - } -- if (read_idx = -1) { -+ if (read_idx = -1) +- if (read_idx == -1) { ++ if (read_idx == -1) // Can this happen ??? return 0; - } @@ -54,12 +55,12 @@ index ffbbb74..132c8cf 100644 - } } while (atomic_read(&dev->overflow_flag)); - read_idx = ++read_idx = MAX_INTERRUPT_BUFFER ? 0 : read_idx; + read_idx = ++read_idx == MAX_INTERRUPT_BUFFER ? 0 : read_idx; @@ -475,9 +471,8 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd, int io_res; /* checks for bytes read/written and copy_to/from_user results */ dev = file->private_data; -- if (dev = NULL) { +- if (dev == NULL) { + if (!dev) return -ENODEV; - } @@ -70,7 +71,7 @@ index ffbbb74..132c8cf 100644 int retval; dev = file->private_data; -- if (dev = NULL) { +- if (dev == NULL) { + if (!dev) return -ENODEV; - } diff --git a/a/content_digest b/N1/content_digest index be6ae3e..bbc2863 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\05f6dd0dd-820e-c3d3-a88d-a16ad5e64aa8@users.sourceforge.net\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH 6/7] USB-iowarrior: Delete unnecessary braces\0" - "Date\0Sun, 21 Aug 2016 14:04:48 +0000\0" + "Date\0Sun, 21 Aug 2016 16:04:48 +0200\0" "To\0linux-usb@vger.kernel.org" Greg Kroah-Hartman <gregkh@linuxfoundation.org> Josh Boyer <jwboyer@fedoraproject.org> @@ -30,9 +30,9 @@ "@@ -227,10 +227,10 @@ static void iowarrior_write_callback(struct urb *urb)\n" " \t/* sync/async unlink faults aren't errors */\n" " \tif (status &&\n" - " \t !(status = -ENOENT ||\n" - "-\t status = -ECONNRESET || status = -ESHUTDOWN)) {\n" - "+\t status = -ECONNRESET || status = -ESHUTDOWN))\n" + " \t !(status == -ENOENT ||\n" + "-\t status == -ECONNRESET || status == -ESHUTDOWN)) {\n" + "+\t status == -ECONNRESET || status == -ESHUTDOWN))\n" " \t\tdev_dbg(&dev->interface->dev,\n" " \t\t\t\"nonzero write bulk status received: %d\\n\", status);\n" "-\t}\n" @@ -42,7 +42,8 @@ " \t\t\t urb->transfer_buffer, urb->transfer_dma);\n" "@@ -304,25 +304,21 @@ static ssize_t iowarrior_read(struct file *file, char __user *buffer,\n" " \t\t\t\t\t\t\t\t read_index\n" - " \t\t\t\t\t\t\t\t (dev)) ! \t\t\t\t\t\t\t\t -1));\n" + " \t\t\t\t\t\t\t\t (dev)) !=\n" + " \t\t\t\t\t\t\t\t -1));\n" "-\t\t\t\tif (r) {\n" "+\t\t\t\tif (r)\n" " \t\t\t\t\t//we were interrupted by a signal\n" @@ -53,8 +54,8 @@ " \t\t\t\t\t//The device was unplugged\n" " \t\t\t\t\treturn -ENODEV;\n" "-\t\t\t\t}\n" - "-\t\t\t\tif (read_idx = -1) {\n" - "+\t\t\t\tif (read_idx = -1)\n" + "-\t\t\t\tif (read_idx == -1) {\n" + "+\t\t\t\tif (read_idx == -1)\n" " \t\t\t\t\t// Can this happen ???\n" " \t\t\t\t\treturn 0;\n" "-\t\t\t\t}\n" @@ -68,12 +69,12 @@ "-\t\t}\n" " \t} while (atomic_read(&dev->overflow_flag));\n" " \n" - " \tread_idx = ++read_idx = MAX_INTERRUPT_BUFFER ? 0 : read_idx;\n" + " \tread_idx = ++read_idx == MAX_INTERRUPT_BUFFER ? 0 : read_idx;\n" "@@ -475,9 +471,8 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd,\n" " \tint io_res;\t\t/* checks for bytes read/written and copy_to/from_user results */\n" " \n" " \tdev = file->private_data;\n" - "-\tif (dev = NULL) {\n" + "-\tif (dev == NULL) {\n" "+\tif (!dev)\n" " \t\treturn -ENODEV;\n" "-\t}\n" @@ -84,7 +85,7 @@ " \tint retval;\n" " \n" " \tdev = file->private_data;\n" - "-\tif (dev = NULL) {\n" + "-\tif (dev == NULL) {\n" "+\tif (!dev)\n" " \t\treturn -ENODEV;\n" "-\t}\n" @@ -94,4 +95,4 @@ "-- \n" 2.9.3 -e8ff2710c35b78927b973f3add3fdbb3d64e9a3dd6a7aca6dd9803732b85a479 +a45f87d6776c1dd037f756adf3ffb32b3beb8565cf47187cc14ce67ecb0f425e
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.