Hi Matthew, could you pick this and the other 3 up for next?
Thanks! On Sun, Feb 27, 2011 at 05:13:25PM +0300, Dan Carpenter wrote: > In the original code, if "device_enum" was NULL then it would > dereference it when it printed the error message. > > Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Mattia Dongili <[email protected]> > --- > v2: Fixed the error message. > > diff --git a/drivers/platform/x86/sony-laptop.c > b/drivers/platform/x86/sony-laptop.c > index 0db9049..c24aa4a 100644 > --- a/drivers/platform/x86/sony-laptop.c > +++ b/drivers/platform/x86/sony-laptop.c > @@ -1311,7 +1311,11 @@ static void sony_nc_rfkill_setup(struct acpi_device > *device) > } > > device_enum = (union acpi_object *) buffer.pointer; > - if (!device_enum || device_enum->type != ACPI_TYPE_BUFFER) { > + if (!device_enum) { > + pr_err(DRV_PFX "No SN06 return object."); > + goto out_no_enum; > + } > + if (device_enum->type != ACPI_TYPE_BUFFER) { > pr_err(DRV_PFX "Invalid SN06 return object 0x%.2x\n", > device_enum->type); > goto out_no_enum; > -- mattia :wq! -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
