← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to drivers/firewire/ohci.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
Import upstream version 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/firewire/ohci.c
2180
2180
        page     = payload >> PAGE_SHIFT;
2181
2181
        offset   = payload & ~PAGE_MASK;
2182
2182
        rest     = p->payload_length;
2183
 
        /*
2184
 
         * The controllers I've tested have not worked correctly when
2185
 
         * second_req_count is zero.  Rather than do something we know won't
2186
 
         * work, return an error
2187
 
         */
2188
 
        if (rest == 0)
2189
 
                return -EINVAL;
2190
2183
 
2191
2184
        /* FIXME: make packet-per-buffer/dual-buffer a context option */
2192
2185
        while (rest > 0) {
2240
2233
                                        unsigned long payload)
2241
2234
{
2242
2235
        struct iso_context *ctx = container_of(base, struct iso_context, base);
2243
 
        struct descriptor *d, *pd;
 
2236
        struct descriptor *d = NULL, *pd = NULL;
2244
2237
        struct fw_iso_packet *p = packet;
2245
2238
        dma_addr_t d_bus, page_bus;
2246
2239
        u32 z, header_z, rest;
2278
2271
                d->data_address = cpu_to_le32(d_bus + (z * sizeof(*d)));
2279
2272
 
2280
2273
                rest = payload_per_buffer;
2281
 
                pd = d;
2282
2274
                for (j = 1; j < z; j++) {
2283
 
                        pd++;
 
2275
                        pd = d + j;
2284
2276
                        pd->control = cpu_to_le16(DESCRIPTOR_STATUS |
2285
2277
                                                  DESCRIPTOR_INPUT_MORE);
2286
2278