Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[pandora-kernel.git] / drivers / staging / comedi / drivers.c

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index dca861e..6d60e91 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -471,9 +471,9 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
 
                async->buf_page_list =
                    vzalloc(sizeof(struct comedi_buf_page) * n_pages);
-               if (async->buf_page_list) {
+               if (async->buf_page_list)
                        pages = vmalloc(sizeof(struct page *) * n_pages);
-               }
+
                if (pages) {
                        for (i = 0; i < n_pages; i++) {
                                if (s->async_dma_dir != DMA_NONE) {