hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/usb/misc/adutux.c
....@@ -109,7 +109,7 @@
109109 function, size, size, data);
110110 }
111111
112
-/**
112
+/*
113113 * adu_abort_transfers
114114 * aborts transfers and frees associated data structures
115115 */
....@@ -346,7 +346,6 @@
346346 struct adu_device *dev;
347347 size_t bytes_read = 0;
348348 size_t bytes_to_read = count;
349
- int i;
350349 int retval = 0;
351350 int timeout = 0;
352351 int should_submit = 0;
....@@ -374,23 +373,22 @@
374373 timeout = COMMAND_TIMEOUT;
375374 dev_dbg(&dev->udev->dev, "%s : about to start looping\n", __func__);
376375 while (bytes_to_read) {
377
- int data_in_secondary = dev->secondary_tail - dev->secondary_head;
376
+ size_t data_in_secondary = dev->secondary_tail - dev->secondary_head;
378377 dev_dbg(&dev->udev->dev,
379
- "%s : while, data_in_secondary=%d, status=%d\n",
378
+ "%s : while, data_in_secondary=%zu, status=%d\n",
380379 __func__, data_in_secondary,
381380 dev->interrupt_in_urb->status);
382381
383382 if (data_in_secondary) {
384383 /* drain secondary buffer */
385
- int amount = bytes_to_read < data_in_secondary ? bytes_to_read : data_in_secondary;
386
- i = copy_to_user(buffer, dev->read_buffer_secondary+dev->secondary_head, amount);
387
- if (i) {
384
+ size_t amount = min(bytes_to_read, data_in_secondary);
385
+ if (copy_to_user(buffer, dev->read_buffer_secondary+dev->secondary_head, amount)) {
388386 retval = -EFAULT;
389387 goto exit;
390388 }
391
- dev->secondary_head += (amount - i);
392
- bytes_read += (amount - i);
393
- bytes_to_read -= (amount - i);
389
+ dev->secondary_head += amount;
390
+ bytes_read += amount;
391
+ bytes_to_read -= amount;
394392 } else {
395393 /* we check the primary buffer */
396394 spin_lock_irqsave (&dev->buflock, flags);
....@@ -645,7 +643,7 @@
645643 .minor_base = ADU_MINOR_BASE,
646644 };
647645
648
-/**
646
+/*
649647 * adu_probe
650648 *
651649 * Called by the usb core when a new device is connected that it thinks
....@@ -756,7 +754,7 @@
756754 return retval;
757755 }
758756
759
-/**
757
+/*
760758 * adu_disconnect
761759 *
762760 * Called by the usb core when the device is removed from the system.