diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 00:36:10 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 02:26:40 -0400 |
commit | bfa6b7bb35a9c8c8acae3056f2cb3364c52693d4 (patch) | |
tree | eb6c4b26737a51b09b5acb26dee1546d5f7571d6 | |
parent | c7c0d0a10f6e4cea95ed84adcdd37948cac09b85 (diff) |
[PATCH] uses of ->Copy() in rioroute are bogus
... there we are building a command in normal memory; it will be
copied to iomem (by ->Copy()) later. Use memcpy()...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | drivers/char/rio/rioroute.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c index 376d0e353dc4..a99f3d9d7d65 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/char/rio/rioroute.c | |||
@@ -307,7 +307,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
307 | if (!RIOBootOk(p, HostP, RtaUniq)) { | 307 | if (!RIOBootOk(p, HostP, RtaUniq)) { |
308 | rio_dprintk(RIO_DEBUG_ROUTE, "RTA %x tried to get an ID, but does not belong - FOAD it!\n", RtaUniq); | 308 | rio_dprintk(RIO_DEBUG_ROUTE, "RTA %x tried to get an ID, but does not belong - FOAD it!\n", RtaUniq); |
309 | PktReplyP->Command = ROUTE_FOAD; | 309 | PktReplyP->Command = ROUTE_FOAD; |
310 | HostP->Copy("RT_FOAD", PktReplyP->CommandText, 7); | 310 | memcpy(PktReplyP->CommandText, "RT_FOAD", 7); |
311 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); | 311 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); |
312 | return 1; | 312 | return 1; |
313 | } | 313 | } |
@@ -341,7 +341,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
341 | HostP->Mapping[ThisUnit].Flags |= MSG_DONE; | 341 | HostP->Mapping[ThisUnit].Flags |= MSG_DONE; |
342 | } | 342 | } |
343 | PktReplyP->Command = ROUTE_FOAD; | 343 | PktReplyP->Command = ROUTE_FOAD; |
344 | HostP->Copy("RT_FOAD", PktReplyP->CommandText, 7); | 344 | memcpy(PktReplyP->CommandText, "RT_FOAD", 7); |
345 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); | 345 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); |
346 | return 1; | 346 | return 1; |
347 | } | 347 | } |
@@ -367,7 +367,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
367 | PktReplyP->IDNum2 = ROUTE_NO_ID; | 367 | PktReplyP->IDNum2 = ROUTE_NO_ID; |
368 | rio_dprintk(RIO_DEBUG_ROUTE, "RTA '%s' has been allocated ID %d\n", HostP->Mapping[ThisUnit].Name, PktReplyP->IDNum); | 368 | rio_dprintk(RIO_DEBUG_ROUTE, "RTA '%s' has been allocated ID %d\n", HostP->Mapping[ThisUnit].Name, PktReplyP->IDNum); |
369 | } | 369 | } |
370 | HostP->Copy("RT_ALLOCAT", PktReplyP->CommandText, 10); | 370 | memcpy(PktReplyP->CommandText, "RT_ALLOCAT", 10); |
371 | 371 | ||
372 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); | 372 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); |
373 | 373 | ||
@@ -469,7 +469,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
469 | } | 469 | } |
470 | 470 | ||
471 | PktReplyP->Command = ROUTE_FOAD; | 471 | PktReplyP->Command = ROUTE_FOAD; |
472 | HostP->Copy("RT_FOAD", PktReplyP->CommandText, 7); | 472 | memcpy(PktReplyP->CommandText, "RT_FOAD", 7); |
473 | } else { | 473 | } else { |
474 | /* | 474 | /* |
475 | ** we did boot it (as an extra), and there may now be a table | 475 | ** we did boot it (as an extra), and there may now be a table |
@@ -489,7 +489,7 @@ int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
489 | } | 489 | } |
490 | } | 490 | } |
491 | PktReplyP->Command = ROUTE_USED; | 491 | PktReplyP->Command = ROUTE_USED; |
492 | HostP->Copy("RT_USED", PktReplyP->CommandText, 7); | 492 | memcpy(PktReplyP->CommandText, "RT_USED", 7); |
493 | } | 493 | } |
494 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); | 494 | RIOQueueCmdBlk(HostP, Rup, CmdBlkP); |
495 | return 1; | 495 | return 1; |