s->left_of_salami -= bytebufsize;
                s->salami += bytebufsize;
        }
-       return 0; /* Success */
+       return 0;
 }
 
 static int xilly_setupchannels(struct xilly_endpoint *ep,
                return -ENODEV;
        }
 
-       return 0; /* Success */
+       return 0;
 }
 
 static ssize_t xillybus_read(struct file *filp, char __user *userbuf,
                }
 
                /*
-                * Formally speaking, we should block for data at this point.
-                * But to keep the code cleaner, we'll just finish the loop,
-                * make the unlikely check for data, and then block at the
-                * usual place.
+                * Reaching here means that we *do* have data in the buffer,
+                * but the "partial" flag disallows returning less than
+                * required. And we don't have as much. So loop again,
+                * which is likely to end up blocking indefinitely until
+                * enough data has arrived.
                 */
        }
 
                        "Failed to quiesce the device on exit.\n");
                return -ENODEV;
        }
-       return 0; /* Success */
+       return 0;
 }
 
 int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint)