diff --git a/[refs] b/[refs] index 58a0d6be834d..5b8d22013be7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b9d7e04a8daaf3e5afe775ec9cbbfda5e32dd5b +refs/heads/master: a9d01d2b49f528ffcf3093a77c66f254d297d5c8 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 17c1df435cc8..e34b421eb2a3 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1040,7 +1040,6 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev, err_out: printk(KERN_WARNING "ata%u: dev %u failed to IDENTIFY (%s)\n", ap->id, dev->devno, reason); - kfree(id); return rc; }