diff --git a/[refs] b/[refs] index 9dfb4697ac12..0ebc5869b331 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a718728f9e40ec79c0879ec6509a54fee214f5b2 +refs/heads/master: 03ee5b1cdd09ed1ee2e75d0bc647fc5db66b9d07 diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c index 56cf59b60ec4..748435807d68 100644 --- a/trunk/drivers/ata/libata-eh.c +++ b/trunk/drivers/ata/libata-eh.c @@ -1796,7 +1796,7 @@ static int ata_eh_suspend(struct ata_port *ap, struct ata_device **r_failed_dev) *r_failed_dev = dev; DPRINTK("EXIT\n"); - return 0; + return rc; } /**