tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
"This is quite late but SCT Write Same support added during this cycle
is broken subtly but seriously and it'd be best to disable it before
v4.9 gets released.

This contains two commits - one low impact sata_mv fix and the
mentioned disabling of SCT Write Same"

* 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata-scsi: disable SCT Write Same for the moment
ata: sata_mv: check for errors when parsing nr-ports from dt

Linus Torvalds 861d75d0 af9468db

+15 -1
+1
drivers/ata/libata-scsi.c
··· 1159 1159 { 1160 1160 sdev->use_10_for_rw = 1; 1161 1161 sdev->use_10_for_ms = 1; 1162 + sdev->no_write_same = 1; 1162 1163 1163 1164 /* Schedule policy is determined by ->qc_defer() callback and 1164 1165 * it needs to see every deferred qc. Set dev_blocked to 1 to
+14 -1
drivers/ata/sata_mv.c
··· 4090 4090 4091 4091 /* allocate host */ 4092 4092 if (pdev->dev.of_node) { 4093 - of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports); 4093 + rc = of_property_read_u32(pdev->dev.of_node, "nr-ports", 4094 + &n_ports); 4095 + if (rc) { 4096 + dev_err(&pdev->dev, 4097 + "error parsing nr-ports property: %d\n", rc); 4098 + return rc; 4099 + } 4100 + 4101 + if (n_ports <= 0) { 4102 + dev_err(&pdev->dev, "nr-ports must be positive: %d\n", 4103 + n_ports); 4104 + return -EINVAL; 4105 + } 4106 + 4094 4107 irq = irq_of_parse_and_map(pdev->dev.of_node, 0); 4095 4108 } else { 4096 4109 mv_platform_data = dev_get_platdata(&pdev->dev);