Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / staging / media / atomisp / pci / atomisp2 / atomisp_fops.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
index d8cfed358d55e15f34a377666e59a4faa8b7d339..dd7596d8763df15720091f889838cbb96e880837 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
@@ -14,10 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
  *
  */
 
@@ -1137,10 +1133,8 @@ static int remove_pad_from_frame(struct atomisp_device *isp,
        ia_css_ptr store = load;
 
        buffer = kmalloc(width*sizeof(load), GFP_KERNEL);
-       if (!buffer) {
-               dev_err(isp->dev, "out of memory.\n");
+       if (!buffer)
                return -ENOMEM;
-       }
 
        load += ISP_LEFT_PAD;
        for (i = 0; i < height; i++) {