* 2.5.1[012] compile fix under drivers/usb/storage
@ 2002-05-01 14:58 Andrew T Sydelko
2002-05-01 17:43 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Andrew T Sydelko @ 2002-05-01 14:58 UTC (permalink / raw)
To: linux-kernel; +Cc: torvalds
The following patch fixes compilation problems due to structure changes.
The patch applies against 2.5.1[012].
drivers/usb/storage/datafab.c
drivers/usb/storage/jumpshot.c
--andy.
diff -uNr linux-2.5.11-clean/drivers/usb/storage/datafab.c linux-2.5.11/drivers/usb/storage/datafab.c
--- linux-2.5.11-clean/drivers/usb/storage/datafab.c Sun Apr 28 22:13:26 2002
+++ linux-2.5.11/drivers/usb/storage/datafab.c Tue Apr 30 14:25:22 2002
@@ -256,7 +256,7 @@
while (sg_idx < use_sg && transferred < len) {
if (len - transferred >= sg[sg_idx].length - current_sg_offset) {
US_DEBUGP("datafab_read_data: adding %d bytes to %d byte sg buffer\n", sg[sg_idx].length - current_sg_offset, sg[sg_idx].length);
- memcpy(sg[sg_idx].address + current_sg_offset,
+ memcpy(page_address(sg[sg_idx].page) + current_sg_offset,
buffer + transferred,
sg[sg_idx].length - current_sg_offset);
transferred += sg[sg_idx].length - current_sg_offset;
@@ -265,7 +265,7 @@
++sg_idx;
} else {
US_DEBUGP("datafab_read_data: adding %d bytes to %d byte sg buffer\n", len - transferred, sg[sg_idx].length);
- memcpy(sg[sg_idx].address + current_sg_offset,
+ memcpy(page_address(sg[sg_idx].page) + current_sg_offset,
buffer + transferred,
len - transferred);
current_sg_offset += len - transferred;
@@ -347,7 +347,7 @@
if (len - transferred >= sg[sg_idx].length - current_sg_offset) {
US_DEBUGP("datafab_write_data: getting %d bytes from %d byte sg buffer\n", sg[sg_idx].length - current_sg_offset, sg[sg_idx].length);
memcpy(ptr + transferred,
- sg[sg_idx].address + current_sg_offset,
+ page_address(sg[sg_idx].page) + current_sg_offset,
sg[sg_idx].length - current_sg_offset);
transferred += sg[sg_idx].length - current_sg_offset;
current_sg_offset = 0;
@@ -356,7 +356,7 @@
} else {
US_DEBUGP("datafab_write_data: getting %d bytes from %d byte sg buffer\n", len - transferred, sg[sg_idx].length);
memcpy(ptr + transferred,
- sg[sg_idx].address + current_sg_offset,
+ page_address(sg[sg_idx].page) + current_sg_offset,
len - transferred);
current_sg_offset += len - transferred;
// we only copied part of this sg buffer
diff -uNr linux-2.5.11-clean/drivers/usb/storage/jumpshot.c linux-2.5.11/drivers/usb/storage/jumpshot.c
--- linux-2.5.11-clean/drivers/usb/storage/jumpshot.c Sun Apr 28 22:11:24 2002
+++ linux-2.5.11/drivers/usb/storage/jumpshot.c Tue Apr 30 14:25:22 2002
@@ -331,7 +331,7 @@
while (sg_idx < use_sg && transferred < len) {
if (len - transferred >= sg[sg_idx].length - current_sg_offset) {
US_DEBUGP("jumpshot_read_data: adding %d bytes to %d byte sg buffer\n", sg[sg_idx].length - current_sg_offset, sg[sg_idx].length);
- memcpy(sg[sg_idx].address + current_sg_offset,
+ memcpy(page_address(sg[sg_idx].page) + current_sg_offset,
buffer + transferred,
sg[sg_idx].length - current_sg_offset);
transferred += sg[sg_idx].length - current_sg_offset;
@@ -340,7 +340,7 @@
++sg_idx;
} else {
US_DEBUGP("jumpshot_read_data: adding %d bytes to %d byte sg buffer\n", len - transferred, sg[sg_idx].length);
- memcpy(sg[sg_idx].address + current_sg_offset,
+ memcpy(page_address(sg[sg_idx].page) + current_sg_offset,
buffer + transferred,
len - transferred);
current_sg_offset += len - transferred;
@@ -413,7 +413,7 @@
if (len - transferred >= sg[sg_idx].length - current_sg_offset) {
US_DEBUGP("jumpshot_write_data: getting %d bytes from %d byte sg buffer\n", sg[sg_idx].length - current_sg_offset, sg[sg_idx].length);
memcpy(ptr + transferred,
- sg[sg_idx].address + current_sg_offset,
+ page_address(sg[sg_idx].page) + current_sg_offset,
sg[sg_idx].length - current_sg_offset);
transferred += sg[sg_idx].length - current_sg_offset;
current_sg_offset = 0;
@@ -422,7 +422,7 @@
} else {
US_DEBUGP("jumpshot_write_data: getting %d bytes from %d byte sg buffer\n", len - transferred, sg[sg_idx].length);
memcpy(ptr + transferred,
- sg[sg_idx].address + current_sg_offset,
+ page_address(sg[sg_idx].page) + current_sg_offset,
len - transferred);
current_sg_offset += len - transferred;
// we only copied part of this sg buffer
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: 2.5.1[012] compile fix under drivers/usb/storage
2002-05-01 14:58 2.5.1[012] compile fix under drivers/usb/storage Andrew T Sydelko
@ 2002-05-01 17:43 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2002-05-01 17:43 UTC (permalink / raw)
To: Andrew T Sydelko; +Cc: linux-kernel, torvalds
On Wed, May 01, 2002 at 09:58:57AM -0500, Andrew T Sydelko wrote:
>
> The following patch fixes compilation problems due to structure changes.
> The patch applies against 2.5.1[012].
>
> drivers/usb/storage/datafab.c
> drivers/usb/storage/jumpshot.c
I don't think this is the proper fix for this code (due to highmem
issues). Could you please work with the usb-storage author and
maintainer to get this fixed.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: 2.5.1[012] compile fix under drivers/usb/storage
@ 2002-05-01 19:34 Andries.Brouwer
0 siblings, 0 replies; 3+ messages in thread
From: Andries.Brouwer @ 2002-05-01 19:34 UTC (permalink / raw)
To: greg, sydelko; +Cc: linux-kernel, torvalds
On Wed, May 01, 2002 at 09:58:57AM -0500, Andrew T Sydelko wrote:
>
> The following patch fixes compilation problems due to structure changes.
> The patch applies against 2.5.1[012].
>
> drivers/usb/storage/datafab.c
> drivers/usb/storage/jumpshot.c
I don't think this is the proper fix for this code (due to highmem
issues). Could you please work with the usb-storage author and
maintainer to get this fixed.
thanks,
greg k-h
It was already fixed in sddr09.c, so the code can be copied from there.
(Indeed, the code was cloned from there, and identical copies occur
in several drivers. I made raw_bulk.c and smartmedia.c to hold the
stuff that is repeated today.)
Andries
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-05-01 19:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-05-01 14:58 2.5.1[012] compile fix under drivers/usb/storage Andrew T Sydelko
2002-05-01 17:43 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2002-05-01 19:34 Andries.Brouwer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox