+- update patches.fixes/linux-post-2.6.4rc1-20040302

[linux-flexiantxendom0-3.2.10.git] / drivers / ieee1394 / ieee1394_transactions.c

diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c
index 4017828..b3b98ea 100644 (file)
--- a/drivers/ieee1394/ieee1394_transactions.c
+++ b/drivers/ieee1394/ieee1394_transactions.c
@@ -239,6 +239,11 @@ int hpsb_packet_success(struct hpsb_packet *packet)
                         return -EAGAIN;
                 }
 
+        case ACK_ADDRESS_ERROR:
+                return -EINVAL;
+
+        case ACK_TARDY:
+        case ACK_CONFLICT_ERROR:
         case ACKX_NONE:
         case ACKX_SEND_ERROR:
         case ACKX_ABORTED:
@@ -263,7 +268,7 @@ struct hpsb_packet *hpsb_make_readpacket(struct hpsb_host *host, nodeid_t node,
        if (length == 0)
                return NULL;
 
-       packet = hpsb_alloc_packet(length + (length % 4 ? 4 - (length % 4) : 0));
+       packet = hpsb_alloc_packet((length + 3) & ~3);
        if (!packet)
                return NULL;
 
@@ -291,7 +296,7 @@ struct hpsb_packet *hpsb_make_writepacket (struct hpsb_host *host, nodeid_t node
        if (length == 0)
                return NULL;
 
-       packet = hpsb_alloc_packet(length + (length % 4 ? 4 - (length % 4) : 0));
+       packet = hpsb_alloc_packet((length + 3) & ~3);
        if (!packet)
                return NULL;
 
@@ -325,7 +330,7 @@ struct hpsb_packet *hpsb_make_streampacket(struct hpsb_host *host, u8 *buffer, i
        if (length == 0)
                return NULL;
 
-       packet = hpsb_alloc_packet(length + (length % 4 ? 4 - (length % 4) : 0));
+       packet = hpsb_alloc_packet((length + 3) & ~3);
        if (!packet)
                return NULL;