On Thu, Nov 24, 2011 at 11:17:56AM +0100, Robert Jarzmik wrote:
> > if (!found)
> > @@ -1138,9 +1141,11 @@ notfound:
> > ret = -ENODEV;
> > dev_info(dev, "No supported DiskOnChip found\n");
> > err_probe:
> > - for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++)
> > + for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) {
> > if (docg3_floors[floor])
> > doc_release_device(docg3_floors[floor]);
> > + }
> > + kfree(docg3_floors);
> This is in conflict. Could you drop that hunk and wait for the other patch to go
> upstream ? Or alternatively use the whole serie in [2] as your base ?
> I think some patches of the serie didn't make it in the tree you're
> using.
>
I'm on linux-next. They're all going to hit linux next soon right?
I can redo the patch later in that case.
regards,
dan carpenter
Attachment:
signature.asc
Description: Digital signature
