diff --git a/[refs] b/[refs] index b8adaa063f7a..63e6e7a75d4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b6d25100ace1dcf9750803ff08f6b61f840be79 +refs/heads/master: b28fe28f2a07ee325834179174a95495d2786561 diff --git a/trunk/drivers/char/sx.c b/trunk/drivers/char/sx.c index d7c416566bd9..518f2a25d91e 100644 --- a/trunk/drivers/char/sx.c +++ b/trunk/drivers/char/sx.c @@ -1789,7 +1789,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd, nbytes - i : SX_CHUNK_SIZE)) { kfree(tmp); rc = -EFAULT; - break; + goto out; } memcpy_toio(board->base2 + offset + i, tmp, (i + SX_CHUNK_SIZE > nbytes) ?