Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index ca758bcb48c9..4bfd3451b568 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -1459,8 +1459,10 @@ int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum,
         if (!(coredev->device_flags & SMS_DEVICE_FAMILY2)) {
                 pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_CONFIG_REQ;
                 if (GetGpioPinParams(PinNum, &TranslatedPinNum, &GroupNum,
-                                &groupCfg) != 0)
-                        return -EINVAL;
+                                &groupCfg) != 0) {
+                        rc = -EINVAL;
+                        goto free;
+                }
 
                 pMsg->msgData[1] = TranslatedPinNum;
                 pMsg->msgData[2] = GroupNum;
@@ -1490,6 +1492,7 @@ int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum,
                 else
                         sms_err("smscore_gpio_configure error");
         }
+free:
         kfree(buffer);
 
         return rc;