From: Olof Johansson Date: Mon, 10 Sep 2012 16:54:38 +0000 (-0700) Subject: CHROMIUM: sd: Fix warning X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=437d25ac2237b12186b91d749dd830e5d2e307e4;p=cascardo%2Flinux.git CHROMIUM: sd: Fix warning drivers/scsi/sd.c:2676:2: warning: assignment from incompatible pointer type [enabled by default] drivers/scsi/sd.c:2913:2: warning: assignment from incompatible pointer type [enabled by default] Since there's no way to return an error, do a WARN_ON() in the error case instead. BUG=chromium-os:34287 TEST=none (we need an automated test for error injection here) Change-Id: Idaf0c0184e81ef7bac63b1deeda1a7690aa48a42 Signed-off-by: Olof Johansson Reviewed-on: https://gerrit.chromium.org/gerrit/32830 Reviewed-by: Sonny Rao --- diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 69350e0ed23d..0aa67df6920f 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -105,7 +105,7 @@ static int sd_probe(struct device *); static int sd_remove(struct device *); static void sd_shutdown(struct device *); static int sd_suspend(struct device *, pm_message_t state); -static int __sd_resume(struct work_struct *work); +static void __sd_resume(struct work_struct *work); static int sd_resume(struct device *); static void sd_rescan(struct device *); static int sd_done(struct scsi_cmnd *); @@ -2889,7 +2889,7 @@ done: return ret; } -static int __sd_resume(struct work_struct *work) +static void __sd_resume(struct work_struct *work) { struct scsi_disk *sdkp = container_of(work, struct scsi_disk, resume_work); @@ -2900,10 +2900,11 @@ static int __sd_resume(struct work_struct *work) sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); ret = sd_start_stop_device(sdkp, 1); + WARN_ON(ret); done: scsi_disk_put(sdkp); - return ret; + return; } static int sd_resume(struct device *dev)