diff --git a/[refs] b/[refs] index 17783a3d0da3..85d0c1bd3d1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecb5f7521a309cb9c5fc0832b9705cd2a03d7d45 +refs/heads/master: 0539771d7236b425f285652f6f297cc7939c8f9a diff --git a/trunk/drivers/acpi/bay.c b/trunk/drivers/acpi/bay.c index 73dc10db4a88..9c28081ba6a6 100644 --- a/trunk/drivers/acpi/bay.c +++ b/trunk/drivers/acpi/bay.c @@ -283,7 +283,7 @@ static int bay_add(acpi_handle handle, int id) /* initialize platform device stuff */ pdev = platform_device_register_simple(ACPI_BAY_CLASS, id, NULL, 0); - if (pdev == NULL) { + if (IS_ERR(pdev)) { printk(KERN_ERR PREFIX "Error registering bay device\n"); goto bay_add_err; }