Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
  vlynq: make whole Kconfig-menu dependant on architecture
  add descriptive comment for TIF_MEMDIE task flag declaration.
  EEPROM: max6875: Header file cleanup
  EEPROM: 93cx6: Header file cleanup
  EEPROM: Header file cleanup
  agp: use NULL instead of 0 when pointer is needed
  rtc-v3020: make bitfield unsigned
  PCI: make bitfield unsigned
  jbd2: use NULL instead of 0 when pointer is needed
  cciss: fix shadows sparse warning
  doc: inode uses a mutex instead of a semaphore.
  uml: i386: Avoid redefinition of NR_syscalls
  fix "seperate" typos in comments
  cocbalt_lcdfb: correct sections
  doc: Change urls for sparse
  Powerpc: wii: Fix typo in comment
  i2o: cleanup some exit paths
  Documentation/: it's -> its where appropriate
  UML: Fix compiler warning due to missing task_struct declaration
  UML: add kernel.h include to signal.c
  ...

1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 11073fa3d9f4..d33693c13368 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -314,22 +314,22 @@ static int i2o_cfg_swul(unsigned long arg)
         int ret = 0;
 
         if (copy_from_user(&kxfer, pxfer, sizeof(struct i2o_sw_xfer)))
-                goto return_fault;
+                return -EFAULT;
 
         if (get_user(swlen, kxfer.swlen) < 0)
-                goto return_fault;
+                return -EFAULT;
 
         if (get_user(maxfrag, kxfer.maxfrag) < 0)
-                goto return_fault;
+                return -EFAULT;
 
         if (get_user(curfrag, kxfer.curfrag) < 0)
-                goto return_fault;
+                return -EFAULT;
 
         if (curfrag == maxfrag)
                 fragsize = swlen - (maxfrag - 1) * 8192;
 
         if (!kxfer.buf)
-                goto return_fault;
+                return -EFAULT;
 
         c = i2o_find_iop(kxfer.iop);
         if (!c)
@@ -373,12 +373,8 @@ static int i2o_cfg_swul(unsigned long arg)
 
         i2o_dma_free(&c->pdev->dev, &buffer);
 
-      return_ret:
         return ret;
-      return_fault:
-        ret = -EFAULT;
-        goto return_ret;
-};
+}
 
 static int i2o_cfg_swdel(unsigned long arg)
 {