diff --git a/[refs] b/[refs] index 7aad7a1e1ed9..8fbb0a0e6d52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e0f8822d1a6d839e66786e99ce1043e4ad1cd72 +refs/heads/master: cf8df962aa830d05be1a8d5a9c7d2a67b2837b45 diff --git a/trunk/drivers/acpi/acpi_lpss.c b/trunk/drivers/acpi/acpi_lpss.c index c87db0e47d09..b1c95422ce74 100644 --- a/trunk/drivers/acpi/acpi_lpss.c +++ b/trunk/drivers/acpi/acpi_lpss.c @@ -150,8 +150,8 @@ static int acpi_lpss_create_device(struct acpi_device *adev, * Skip the device, but don't terminate the namespace * scan. */ - ret = 0; - goto err_out; + kfree(pdata); + return 0; } }