lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 191/205] scsi: aic94xx: fix module loading
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: James Bottomley <James.Bottomley@HansenPartnership.com>

    commit 42caa0edabd6a0a392ec36a5f0943924e4954311 upstream.

    The aic94xx driver is currently failing to load with errors like

    sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:03.0/0000:02:00.3/0000:07:02.0/revision'

    Because the PCI code had recently added a file named 'revision' to every
    PCI device. Fix this by renaming the aic94xx revision file to
    aic_revision. This is safe to do for us because as far as I can tell,
    there's nothing in userspace relying on the current aic94xx revision file
    so it can be renamed without breaking anything.

    Fixes: 702ed3be1b1b (PCI: Create revision file in sysfs)
    Cc: stable@vger.kernel.org
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/aic94xx/aic94xx_init.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/scsi/aic94xx/aic94xx_init.c
    +++ b/drivers/scsi/aic94xx/aic94xx_init.c
    @@ -281,7 +281,7 @@ static ssize_t asd_show_dev_rev(struct d
    return snprintf(buf, PAGE_SIZE, "%s\n",
    asd_dev_rev[asd_ha->revision_id]);
    }
    -static DEVICE_ATTR(revision, S_IRUGO, asd_show_dev_rev, NULL);
    +static DEVICE_ATTR(aic_revision, S_IRUGO, asd_show_dev_rev, NULL);

    static ssize_t asd_show_dev_bios_build(struct device *dev,
    struct device_attribute *attr,char *buf)
    @@ -478,7 +478,7 @@ static int asd_create_dev_attrs(struct a
    {
    int err;

    - err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_revision);
    + err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision);
    if (err)
    return err;

    @@ -500,13 +500,13 @@ err_update_bios:
    err_biosb:
    device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
    err_rev:
    - device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
    + device_remove_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision);
    return err;
    }

    static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha)
    {
    - device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
    + device_remove_file(&asd_ha->pcidev->dev, &dev_attr_aic_revision);
    device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
    device_remove_file(&asd_ha->pcidev->dev, &dev_attr_pcba_sn);
    device_remove_file(&asd_ha->pcidev->dev, &dev_attr_update_bios);

    \
     
     \ /
      Last update: 2019-02-11 16:22    [W:4.169 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site