Clemens Ladisch 766b8a7f7e
usb: fix number of mapped SG DMA entries ...
commit bc677d5b64644c399cd3db6a905453e611f402ab upstream.
Add a new field num_mapped_sgs to struct urb so that we have a place to
store the number of mapped entries and can also retain the original
value of entries in num_sgs. Previously, usb_hcd_map_urb_for_dma()
would overwrite this with the number of mapped entries, which would
break dma_unmap_sg() because it requires the original number of entries.
This fixes warnings like the following when using USB storage devices:
------------[ cut here ]------------
WARNING: at lib/dma-debug.c:902 check_unmap+0x4e4/0x695()
ehci_hcd 0000:00:12.2: DMA-API: device driver frees DMA sg list with different entry count [map count=4] [unmap count=1]
Modules linked in: ohci_hcd ehci_hcd
Pid: 0, comm: kworker/0:1 Not tainted 3.2.0-rc2+ #319
Call Trace:
<IRQ> [<ffffffff81036d3b>] warn_slowpath_common+0x80/0x98
[<ffffffff81036de7>] warn_slowpath_fmt+0x41/0x43
[<ffffffff811fa5ae>] check_unmap+0x4e4/0x695
[<ffffffff8105e92c>] ? trace_hardirqs_off+0xd/0xf
[<ffffffff8147208b>] ? _raw_spin_unlock_irqrestore+0x33/0x50
[<ffffffff811fa84a>] debug_dma_unmap_sg+0xeb/0x117
[<ffffffff8137b02f>] usb_hcd_unmap_urb_for_dma+0x71/0x188
[<ffffffff8137b166>] unmap_urb_for_dma+0x20/0x22
[<ffffffff8137b1c5>] usb_hcd_giveback_urb+0x5d/0xc0
[<ffffffffa0000d02>] ehci_urb_done+0xf7/0x10c [ehci_hcd]
[<ffffffffa0001140>] qh_completions+0x429/0x4bd [ehci_hcd]
[<ffffffffa000340a>] ehci_work+0x95/0x9c0 [ehci_hcd]
...
---[ end trace f29ac88a5a48c580 ]---
Mapped at:
[<ffffffff811faac4>] debug_dma_map_sg+0x45/0x139
[<ffffffff8137bc0b>] usb_hcd_map_urb_for_dma+0x22e/0x478
[<ffffffff8137c494>] usb_hcd_submit_urb+0x63f/0x6fa
[<ffffffff8137d01c>] usb_submit_urb+0x2c7/0x2de
[<ffffffff8137dcd4>] usb_sg_wait+0x55/0x161
Signed-off-by: Clemens Ladisch <clemens@ladisch.de >
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de >
2012-01-12 11:35:25 -08:00
2011-06-16 12:01:57 -07:00
2011-05-11 14:50:41 -04:00
2011-05-04 14:08:36 -07:00
2011-05-24 11:52:05 -07:00
2011-03-31 11:26:23 -03:00
2011-05-20 18:51:09 -03:00
2012-01-06 14:14:11 -08:00
2011-06-20 08:59:46 -07:00
2011-03-31 11:26:23 -03:00
2011-10-03 11:40:26 -07:00
2011-03-23 12:24:23 -07:00
2011-07-13 14:54:37 -04:00
2011-06-01 11:36:49 +01:00
2011-06-06 01:35:10 +02:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-03-16 15:11:04 -07:00
2011-04-20 17:48:49 +04:00
2011-03-31 11:26:23 -03:00
2011-05-27 10:34:37 +01:00
2011-05-26 12:13:22 -07:00
2011-05-20 13:43:21 -07:00
2011-06-21 18:20:55 -07:00
2011-11-11 09:35:16 -08:00
2011-03-31 11:26:23 -03:00
2011-04-01 02:24:31 -04:00
2011-03-21 22:59:08 -04:00
2011-04-28 13:39:17 -07:00
2011-03-15 02:42:32 -04:00
2011-04-25 14:50:08 -04:00
2011-03-30 16:53:38 -07:00
2011-05-28 17:41:46 +02:00
2011-03-10 08:52:07 +01:00
2011-03-22 17:43:59 -07:00
2011-06-10 08:46:26 -06:00
2011-03-11 14:25:50 +00:00
2011-04-09 15:53:56 +02:00
2011-03-08 08:28:01 +01:00
2011-04-25 18:10:58 -07:00
2011-05-25 08:39:45 -07:00
2011-05-26 17:12:38 -07:00
2011-06-20 13:23:14 +02:00
2012-01-06 14:13:48 -08:00
2011-06-13 10:42:49 +02:00
2011-05-25 08:39:30 -07:00
2011-05-19 16:55:27 +09:30
2011-05-26 07:26:45 -04:00
2011-05-25 08:39:43 -07:00
2011-05-24 22:55:24 +10:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-05-26 17:12:34 -07:00
2011-05-26 17:12:34 -07:00
2011-05-26 10:01:36 -06:00
2011-05-19 14:24:16 +02:00
2011-06-16 19:30:53 +02:00
2011-03-31 11:26:23 -03:00
2011-03-22 17:44:00 -07:00
2011-06-27 18:00:13 -07:00
2011-03-22 17:44:10 -07:00
2011-05-25 08:39:47 -07:00
2011-05-25 08:39:46 -07:00
2011-03-31 11:26:23 -03:00
2011-06-07 12:02:00 -07:00
2011-03-31 11:26:23 -03:00
2011-05-04 11:50:57 -04:00
2011-05-25 08:39:45 -07:00
2011-05-28 17:02:57 +02:00
2011-05-26 17:12:37 -07:00
2011-03-22 17:44:15 -07:00
2011-05-19 15:59:38 -07:00
2011-08-15 18:31:35 -07:00
2011-03-22 19:25:05 -07:00
2011-12-21 12:57:36 -08:00
2011-03-14 17:02:43 -07:00
2011-03-08 16:10:38 +01:00
2011-06-20 10:46:04 -04:00
2011-05-29 12:52:55 +01:00
2011-06-27 16:06:19 -07:00
2011-05-23 10:47:06 -05:00
2011-05-29 13:03:09 +01:00
2011-03-24 13:54:30 +00:00
2011-05-29 13:03:13 +01:00
2011-06-01 12:26:35 +01:00
2011-03-31 11:26:23 -03:00
2011-06-30 09:23:45 +02:00
2011-03-10 11:35:17 +01:00
2011-05-24 10:21:29 +02:00
2011-05-24 10:21:29 +02:00
2011-05-25 18:30:37 +05:30
2011-04-04 12:48:08 -04:00
2011-05-25 17:03:53 -07:00
2011-04-05 23:51:37 +02:00
2011-05-14 21:36:55 +01:00
2011-03-22 17:44:11 -07:00
2011-06-09 15:05:48 -07:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-11-11 09:36:32 -08:00
2011-11-11 09:36:32 -08:00
2011-05-12 07:37:51 -07:00
2011-03-14 19:12:20 -04:00
2011-03-15 02:21:45 -04:00
2011-05-22 21:01:22 -04:00
2011-08-04 21:58:34 -07:00
2011-05-10 22:53:46 +02:00
2011-05-26 17:12:33 -07:00
2011-12-21 12:57:36 -08:00
2011-05-25 08:39:44 -07:00
2011-07-07 13:21:56 -07:00
2011-05-02 16:59:38 -07:00
2011-06-24 17:08:49 +09:00
2011-05-25 22:13:44 -04:00
2011-10-16 14:14:55 -07:00
2011-05-25 08:39:54 -07:00
2011-05-30 07:42:51 +02:00
2011-05-25 08:39:11 -07:00
2011-04-11 23:53:19 -07:00
2011-06-16 08:40:52 -06:00
2011-03-05 10:56:00 +01:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-06-27 16:06:19 -07:00
2011-05-25 08:39:19 -07:00
2011-05-26 09:20:31 -07:00
2011-05-26 12:03:50 -07:00
2011-05-25 20:43:32 +02:00
2011-03-31 11:26:23 -03:00
2011-03-12 15:08:54 -08:00
2011-05-08 16:41:45 -07:00
2011-06-01 14:34:01 -04:00
2011-05-27 13:40:54 -04:00
2011-05-10 14:36:03 -07:00
2011-06-06 22:42:06 -07:00
2011-03-18 15:14:45 -07:00
2011-06-11 16:15:50 -07:00
2011-08-15 18:31:38 -07:00
2011-03-10 16:37:26 -08:00
2011-05-26 17:12:34 -07:00
2011-05-16 14:46:30 -04:00
2011-04-18 13:29:03 -07:00
2011-11-11 09:35:54 -08:00
2011-11-11 09:36:00 -08:00
2011-03-23 19:47:08 -07:00
2011-05-26 17:12:37 -07:00
2011-03-31 11:26:23 -03:00
2011-07-07 16:02:26 +00:00
2011-05-18 14:59:08 +02:00
2011-06-03 14:53:15 +02:00
2011-03-31 11:26:23 -03:00
2011-06-13 15:38:22 -04:00
2011-11-11 09:35:52 -08:00
2011-03-20 20:08:48 -04:00
2011-04-04 12:48:08 -04:00
2011-03-24 08:36:10 +01:00
2011-03-22 16:17:32 -07:00
2011-05-25 16:55:55 -07:00
2011-06-15 20:04:00 -07:00
2011-04-01 16:14:30 +11:00
2011-03-08 11:17:18 +11:00
2011-05-27 10:25:02 -07:00
2011-03-08 11:17:22 +11:00
2011-03-18 16:54:31 +00:00
2011-06-17 09:40:48 -07:00
2011-06-15 20:03:59 -07:00
2011-06-12 17:45:41 -04:00
2011-03-22 17:44:01 -07:00
2011-03-31 11:26:23 -03:00
2011-05-23 15:39:34 -07:00
2011-05-22 08:47:53 -04:00
2011-03-31 11:26:23 -03:00
2011-05-25 08:39:50 -07:00
2011-04-13 11:11:43 +02:00
2011-05-25 08:39:51 -07:00
2012-01-06 14:13:55 -08:00
2011-05-19 20:50:53 -04:00
2011-05-24 14:33:35 +02:00
2011-04-25 18:14:10 -07:00
2011-05-19 14:15:29 -07:00
2011-05-25 08:39:17 -07:00
2011-12-21 12:57:38 -08:00
2011-05-24 10:01:37 +02:00
2011-04-25 18:14:07 -04:00
2011-03-18 22:33:38 -07:00
2011-03-22 04:53:56 -03:00
2011-05-25 08:39:48 -07:00
2011-06-15 20:03:59 -07:00
2011-07-12 11:08:01 +10:00
2011-05-25 08:39:34 -07:00
2011-11-11 09:36:29 -08:00
2011-11-11 09:36:48 -08:00
2011-05-25 08:39:19 -07:00
2011-06-27 14:13:09 -07:00
2011-05-10 15:54:54 -04:00
2011-05-19 16:55:27 +09:30
2011-05-19 16:55:25 +09:30
2011-03-31 11:26:23 -03:00
2011-05-04 12:18:54 -07:00
2011-03-02 13:43:15 -08:00
2011-05-25 08:39:17 -07:00
2011-05-09 11:40:38 +10:00
2011-11-11 09:36:23 -08:00
2011-05-27 13:41:33 -04:00
2011-08-04 21:58:31 -07:00
2011-05-27 13:40:58 -04:00
2011-05-20 11:46:11 -07:00
2011-05-29 14:10:13 -07:00
2011-04-24 14:28:18 -04:00
2011-11-26 09:09:59 -08:00
2011-03-11 15:39:26 -05:00
2011-03-11 15:38:44 -05:00
2011-06-20 16:12:26 -04:00
2011-11-26 09:09:59 -08:00
2011-05-10 22:21:45 +09:00
2011-05-16 19:32:19 -04:00
2011-05-23 11:58:59 +02:00
2011-05-22 21:01:19 -04:00
2011-05-26 17:12:34 -07:00
2011-05-18 12:32:23 -06:00
2011-04-20 17:01:19 +10:00
2011-03-23 14:55:56 -06:00
2011-03-16 17:28:10 -07:00
2011-03-31 11:26:23 -03:00
2011-05-25 08:39:10 -07:00
2011-03-31 11:26:23 -03:00
2011-05-29 12:40:51 +02:00
2011-05-25 08:39:25 -07:00
2011-03-14 02:58:03 -04:00
2011-06-18 22:18:18 -04:00
2011-05-11 15:18:53 -07:00
2011-05-21 12:16:44 -07:00
2011-04-11 09:01:41 +02:00
2011-05-24 12:06:40 -07:00
2011-05-25 08:39:54 -07:00
2011-06-03 19:33:49 +03:00
2011-06-04 12:31:14 +02:00
2011-08-29 13:29:16 -07:00
2011-03-09 11:59:33 -08:00
2011-11-11 09:35:52 -08:00
2011-05-26 17:12:37 -07:00
2011-04-11 13:44:25 -07:00
2011-05-16 20:17:47 +02:00
2011-03-11 15:13:26 -05:00
2011-05-29 00:50:59 -04:00
2011-04-30 00:25:44 +02:00
2011-03-15 00:43:14 +01:00
2011-06-21 23:20:20 +02:00
2011-05-29 20:52:36 +03:00
2011-03-31 11:26:23 -03:00
2011-05-10 10:16:21 +02:00
2011-05-24 12:10:51 +02:00
2011-03-01 22:27:26 +03:00
2011-03-31 11:26:23 -03:00
2011-05-25 08:39:48 -07:00
2011-05-26 17:12:36 -07:00
2011-05-16 11:05:00 -07:00
2011-05-13 16:31:00 -07:00
2011-10-16 14:14:53 -07:00
2011-05-23 13:01:00 -07:00
2011-05-23 13:01:00 -07:00
2011-04-25 17:28:24 +02:00
2011-03-22 17:44:00 -07:00
2011-03-31 11:26:23 -03:00
2011-03-24 21:16:31 -04:00
2011-08-15 18:31:35 -07:00
2011-05-26 15:00:31 -04:00
2011-04-26 14:01:42 -07:00
2011-05-19 14:15:29 -07:00
2011-05-05 23:16:59 -07:00
2011-05-05 23:16:59 -07:00
2011-05-05 23:16:59 -07:00
2011-03-31 11:26:23 -03:00
2011-03-23 19:46:23 -07:00
2011-05-19 13:53:54 -04:00
2011-04-19 15:38:02 -04:00
2011-03-09 13:52:27 -05:00
2011-03-23 19:46:41 -07:00
2011-04-14 16:06:56 -07:00
2011-10-03 11:39:46 -07:00
2011-04-14 16:06:56 -07:00
2011-05-25 08:39:19 -07:00
2011-05-12 08:28:47 -07:00
2011-10-03 11:40:08 -07:00
2011-10-16 14:14:51 -07:00
2011-07-18 11:06:03 -07:00
2011-04-25 10:20:32 -04:00
2011-06-11 13:17:28 -07:00
2011-05-19 16:51:01 -07:00
2011-05-19 16:51:02 -07:00
2011-06-27 18:00:12 -07:00
2011-05-19 08:19:36 -07:00
2011-12-09 08:52:39 -08:00
2011-05-20 13:33:21 -07:00
2011-11-11 09:35:52 -08:00
2011-05-21 12:53:53 +03:00
2011-03-22 17:16:34 +09:00
2011-03-31 11:26:23 -03:00
2011-06-17 10:17:12 +02:00
2011-04-13 17:13:00 -07:00
2011-05-05 11:10:14 -07:00
2011-03-09 14:08:09 -08:00
2011-03-28 06:05:24 -04:00
2011-03-31 11:26:23 -03:00
2011-05-20 12:51:07 -07:00
2011-03-31 11:26:23 -03:00
2011-05-03 16:09:40 -07:00
2011-08-29 13:29:08 -07:00
2011-05-19 16:55:28 +09:30
2011-04-11 22:54:42 +02:00
2011-03-22 15:47:22 +09:00
2011-06-27 18:00:12 -07:00
2011-06-06 15:41:16 -04:00
2011-05-25 18:10:16 -07:00
2011-03-15 00:43:46 +01:00
2011-03-09 16:43:24 -08:00
2011-05-11 21:37:15 +02:00
2011-06-12 17:45:41 -04:00
2011-05-23 13:59:54 +02:00
2011-04-22 17:01:09 -07:00
2011-05-23 13:59:53 +02:00
2011-05-23 13:59:53 +02:00
2011-04-26 14:01:42 -07:00
2011-03-13 16:35:18 -04:00
2011-05-10 16:03:56 -04:00
2011-06-15 20:03:59 -07:00
2011-05-20 13:33:21 -07:00
2011-04-04 12:48:08 -04:00
2011-10-03 11:39:49 -07:00
2011-06-04 06:33:24 +09:00
2011-11-11 09:35:12 -08:00
2011-03-22 17:44:09 -07:00
2011-05-25 19:56:23 -04:00
2011-03-31 11:26:23 -03:00
2011-06-07 09:05:42 -07:00
2012-01-12 11:35:25 -08:00
2011-06-15 20:04:00 -07:00
2011-03-23 19:47:03 -07:00
2011-05-20 09:30:46 -03:00
2011-03-31 11:26:23 -03:00
2011-05-20 11:28:49 -03:00
2011-03-22 04:53:33 -03:00
2011-03-31 11:26:23 -03:00
2011-05-20 12:17:35 -03:00
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:14 +09:30
2011-05-30 11:14:16 +09:30
2011-05-26 17:12:34 -07:00
2011-11-11 09:36:18 -08:00
2011-05-26 17:12:34 -07:00
2011-03-31 11:26:23 -03:00
2011-04-19 16:49:20 +03:00
2011-10-03 11:40:43 -07:00
2011-05-25 08:39:45 -07:00
2011-03-13 20:22:28 -07:00
2011-03-31 11:26:23 -03:00
2011-03-22 17:44:17 -07:00
766b8a7f7e