diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-15 15:24:44 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-15 15:24:44 -0700 |
| commit | a7dee8f45fa2948b74d8e84ba24e435c87fd0acf (patch) | |
| tree | 06ec1c93334f581e341cf74f5639ce645266fc14 /drivers/scsi/ipr.c | |
| parent | 7ee7895c93d1d6cafad2f5d187f0a9369e91eaec (diff) | |
| parent | 5ecee0a3ee8d74b6950cb41e8989b0c2174568d4 (diff) | |
| download | linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.gz linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.xz | |
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 3b3e0998fa6e..d6a691e27d33 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -4002,6 +4002,7 @@ static ssize_t ipr_store_update_fw(struct device *dev, struct ipr_sglist *sglist; char fname[100]; char *src; + char *endline; int result, dnld_size; if (!capable(CAP_SYS_ADMIN)) @@ -4009,6 +4010,10 @@ static ssize_t ipr_store_update_fw(struct device *dev, snprintf(fname, sizeof(fname), "%s", buf); + endline = strchr(fname, '\n'); + if (endline) + *endline = '\0'; + if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); return -EIO; |