← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/squashfs/lzo_wrapper.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/squashfs/lzo_wrapper.c
37
37
        void    *output;
38
38
};
39
39
 
40
 
static void *lzo_init(struct squashfs_sb_info *msblk)
 
40
static void *lzo_init(struct squashfs_sb_info *msblk, void *buff, int len)
41
41
{
42
42
        int block_size = max_t(int, msblk->block_size, SQUASHFS_METADATA_SIZE);
43
43
 
58
58
failed:
59
59
        ERROR("Failed to allocate lzo workspace\n");
60
60
        kfree(stream);
61
 
        return NULL;
 
61
        return ERR_PTR(-ENOMEM);
62
62
}
63
63
 
64
64